diff --git a/README.md b/README.md
index 3b4e762..2427556 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
-# pizza-service
-=======
-# pizza-service
->>>>>>> main
+# pizza-service
\ No newline at end of file