From 59dd023eb7dcbacdc7217d47bb7a3fbb524070c8 Mon Sep 17 00:00:00 2001
From: yasaminashoori <yasaminashoori18@gmail.com>
Date: Thu, 11 May 2023 01:20:15 +0430
Subject: [PATCH] add branch yasamin test

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1780ef4..84cbb6c 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# This is a test for push action in git!
+# This is a test for conflict! v1.0
 
 ## Introduction