diff --git a/README.txt b/README.txt
index 1e3feca..9ddd3c6 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-=======
 A simple Pac-Man clone.
 So far.
 About to add Path finding for the Ghosts and an A.I. that controls Pac-Man.
-blob
->>>>>>> 580458bbfd7baf561a1e7de924bcf0e3d50c4b48
+blab
\ No newline at end of file