2 files changed, 1 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index 75bc0c3..4f6e4ab 100644
--- a/main.cpp
+++ b/main.cpp
@@ -624,7 +624,6 @@ void render(){
 	player->inv->draw();
 
 	/*
-<<<<<<< HEAD
 	 *	Here we draw a black overlay if it's been requested.
 	*/
 
diff --git a/src/world.cpp b/src/world.cpp
index 811ae5a..0b1af33 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1591,4 +1591,4 @@ World *loadWorldFromXMLNoSave(const char *path){
 	}
 
 	return tmp;
-}
+}
\ No newline at end of file