diff --git a/README.md b/README.md
index a928806..bdd8307 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 # gitProject1
-abc
\ No newline at end of file
+abc
+=======
+# gitProject1
+>>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249