diff --git a/README.md b/README.md
index 02313e2..1146940 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,6 @@
 
 Rendering beautiful isometric terrain, using sprites, in C on the TI-84+ CE.
 
-<<<<<<< HEAD
 currently in progress, its an experiment, might be a game of some sort soon
 
 ![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render021.png)
-=======
-![A Screenshot](https://raw.githubusercontent.com/Michael2-3B/Iso-Render/master/screenshots/render013.png)
->>>>>>> 09d9b772369e3099a6ca28c7c3e2cb9c8a86ab6f