diff --git a/src/NDS.cpp b/src/NDS.cpp
index f415819f..da4fc5f6 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -323,8 +323,6 @@ void Reset()
     _soundbias = 0;
 }
 
-<<<<<<< HEAD:src/NDS.cpp
-
 void LoadROM(const char* path, bool direct)
 {
     Reset();