diff --git a/src/input.h b/src/input.h
index 92cca970..7f3d2cb5 100644
--- a/src/input.h
+++ b/src/input.h
@@ -221,19 +221,12 @@ enum EMUCMD
 	EMUCMD_MISC_TOGGLEFULLSCREEN,
 	EMUCMD_TOOL_OPENRAMWATCH,
 	EMUCMD_TOOL_OPENRAMSEARCH,
-<<<<<<< .mine
 	EMUCMD_TOOL_RAMSEARCHLT,
 	EMUCMD_TOOL_RAMSEARCHGT,
 	EMUCMD_TOOL_RAMSEARCHLTE,
 	EMUCMD_TOOL_RAMSEARCHGTE,
 	EMUCMD_TOOL_RAMSEARCHEQ,
 	EMUCMD_TOOL_RAMSEARCHNE,
-=======
-	EMUCMD_CHEAT_SEARCHEQ,
-	EMUCMD_CHEAT_SEARCHNE,
-	EMUCMD_CHEAT_SEARCHLT,
-	EMUCMD_CHEAT_SEARCHGT,
->>>>>>> .r1856
 	EMUCMD_MAX
 };