From 99631160fde091f8c02648d1d1d220d846ec3ee2 Mon Sep 17 00:00:00 2001
From: yasaminashoori <yasaminashoori18@gmail.com>
Date: Thu, 11 May 2023 01:21:02 +0430
Subject: [PATCH] add master conflict test

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

diff --git a/README.md b/README.md
index d95eb25..e75ec93 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# This is a test for push action in git!
+# This is second test for conflict! v2.0
 
 This is second commit!