diff --git a/README.md b/README.md
index 4c1428a..36580f1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,11 @@
+<<<<<<< HEAD
 # Tetris
 Basic tetris write in C++ and SDL
 
 ## Changelog
 * 4/6/2015
-  * Replaced SDL with SDL2
\ No newline at end of file
+  * Replaced SDL with SDL2
+=======
+# Tetris
+My tetris game
+>>>>>>> master