diff --git a/README.txt b/README.txt
index c0f0ec4..a60e789 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,9 @@
 A simple Pac-Man clone.
 So far.
+<<<<<<< HEAD
+About to add Path finding for the Ghosts and an A.I. that controlss Pac-Man.
+blebblobr5ft6z7 vjn
+=======
 About to add Path finding for the Ghosts and an A.I. that controls Pac-Man.
-blebblobr5ft6z7 vjn
\ No newline at end of file
+>>>>>>> 9346a1e20864c03e995f940f6aae6ec2aac5a4c9
+jzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
\ No newline at end of file