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