diff --git a/README.md b/README.md
index 60a423b..99ee09b 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
-123445
\ No newline at end of file
+<<<<<<< HEAD
+123445
+=======
+123479
+>>>>>>> feature-x