diff --git a/README.md b/README.md
index e69de29..bcfd1bf 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/master