diff --git a/.gitignore b/.gitignore
index 3bef3bc..afc042e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@
 
 # Linker output
 *.ilk
-#*.map
 *.exp
 
 # Precompiled Headers
diff --git a/README.md b/README.md
index c4f71af..30f4c9a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-# README.md
-===
-
-<<<<<<< HEAD
 # Beagle Rescue Game
 ---
 Global Game Jam 2021 theme: Lost and Found
@@ -9,8 +5,3 @@ A 2D platformer where you rescue lost puppies
 By:
 Alan Youngblood
 Simon Zaleski
-=======
-# Graveyard Shift Game
----
-This is a project that was originally started with the Q3 2019 ClockworkPi Game Jam. The theme was "Shift" and this game idea is essentially a tower defense where you play as an owl that sets traps during the day then during the "Graveyard Shift" at night robber rodents try to steal treasure from the burial sites. The owl can also do a swoop attack to scare off the rodents during the night time. Traps can only be set during the day.
->>>>>>> origin/master