diff --git a/README.md b/README.md
index 7301f9b..72ef5be 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,10 @@
 
 Rendering beautiful isometric terrain, using sprites, in C on the TI-84+ CE.
 
-<<<<<<< HEAD
 Player positioning is a bit borked right now
 However you can still move using the numpad buttons 1, 7, 9, and 3 in order to go in those directions on the map
 
-This program is currently in progress, its mostly an experiment, but might be a game soon
+This program is currently in progress, its mostly an experiment, but might be a game soon.
 
 ![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render029.png)
 
@@ -15,8 +14,3 @@ This program is currently in progress, its mostly an experiment, but might be a
 ![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render024.png)
 
 ![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render022.gif)
-=======
-currently in progress, its just an experiment for now, but might be a game of some sort eventually
-
-![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render021.png)
->>>>>>> c5c39a1c86bccea21dd344520930d85093ac865a