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