From 04505022baf5ed59a7eba2174c5e122311ea3917 Mon Sep 17 00:00:00 2001
From: Yosra Emad <yosraemad14@gmail.com>
Date: Sun, 7 Aug 2022 15:59:41 +0200
Subject: [PATCH 1/2] Added my name to exercise 4

---
 exercises/04-managing-conflicts/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/04-managing-conflicts/README.md b/exercises/04-managing-conflicts/README.md
index dd498e0..38b5168 100644
--- a/exercises/04-managing-conflicts/README.md
+++ b/exercises/04-managing-conflicts/README.md
@@ -1 +1 @@
-Add your name to this readme file then open a PR on GitHub.
\ No newline at end of file
+Yosra Emad

From b8744755641e35631d90927df9dd71a03020d452 Mon Sep 17 00:00:00 2001
From: Yosra Emad <yosraemad14@gmail.com>
Date: Sun, 7 Aug 2022 16:05:01 +0200
Subject: [PATCH 2/2] Resolve Conflicts

---
 exercises/04-managing-conflicts/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/exercises/04-managing-conflicts/README.md b/exercises/04-managing-conflicts/README.md
index 38b5168..53f8239 100644
--- a/exercises/04-managing-conflicts/README.md
+++ b/exercises/04-managing-conflicts/README.md
@@ -1 +1,3 @@
 Yosra Emad
+Add your name to this readme file then open a PR on GitHub.
+Islam tarek