diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp
index 20d4f9d0e3..c8ef0a24c4 100644
--- a/Source/Core/Core/Src/PatchEngine.cpp
+++ b/Source/Core/Core/Src/PatchEngine.cpp
@@ -146,8 +146,6 @@ void PatchEngine_ApplyARPatches()
 		if (iter->active)
 			RunActionReplayCode(*iter, false);
 	}
-<<<<<<< .mine
-}=======
 }
 
 void LoadActionReplayCodes(IniFile &ini) 
@@ -430,4 +428,3 @@ void RunActionReplayCode(const ARCode &code, bool nowIsBootup) {
 		}
 	}
 }
->>>>>>> .r873