diff --git a/.gitignore b/.gitignore
index 32d3ba1..e3460eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 # ---> KDevelop4
 #*.kdev4
 #.kdev4/
@@ -7,7 +5,6 @@
 # --->  build artifacts
 build/*
 
->>>>>>> master
 # ---> C++
 # Prerequisites
 *.d
@@ -54,10 +51,7 @@ build/*
 
 # Linker output
 *.ilk
-<<<<<<< HEAD
 *.map
-=======
->>>>>>> master
 *.exp
 
 # Precompiled Headers
@@ -99,7 +93,6 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-<<<<<<< HEAD
 # ---> CMake
 CMakeLists.txt.user
 CMakeCache.txt
@@ -112,8 +105,6 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
-=======
 # CMake artifacts
 CMakeCache.txt
->>>>>>> master
 
diff --git a/LICENSE b/LICENSE
index 99741a3..c8b7c31 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,15 +1,7 @@
-<<<<<<< HEAD
+=======
 MIT License
 
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=======
-MIT License Copyright (c) 2023 Alan Youngblood
+Copyright (c) 2023 Alan Youngblood
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,4 +20,5 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
 OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
 OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
->>>>>>> master
+
+=======
diff --git a/README.md b/README.md
index 1714a36..d8211ff 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-# KaijuSaveEarth
-
-LowRezJam 2023
-Kaiju Save Earth
-A game where you play as a giant monster trying to save as many humans as possible before they destroy themselves and the world!
 =======
 # Kaiju Save Earth
 ---
@@ -13,4 +7,3 @@ A game where you play as a giant monster (Kaiju) who must save all the humans fr
 
 By:
 Alan Youngblood
->>>>>>> master