diff --git a/addons/missileguidance/XEH_PREP.hpp b/addons/missileguidance/XEH_PREP.hpp
index 92366c57ea..d3ea2fdb93 100644
--- a/addons/missileguidance/XEH_PREP.hpp
+++ b/addons/missileguidance/XEH_PREP.hpp
@@ -54,11 +54,7 @@ PREP(gps_attackOnFired);
 // Seeker OnFired
 PREP(SACLOS_onFired);
 PREP(mwr_onFired);
-<<<<<<< HEAD
-=======
-PREP(IR_onFired);
 PREP(gps_seekerOnFired);
->>>>>>> parent of 744cd45ee (remove gps definitions)
 
 // Navigation OnFired
 PREP(proNav_onFired);