diff --git a/addons/dragon/functions/script_component.hpp b/addons/dragon/functions/script_component.hpp
deleted file mode 100644
index 1590d769e8..0000000000
--- a/addons/dragon/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "\z\ace\addons\dragon\script_component.hpp"
diff --git a/addons/hellfire/functions/script_component.hpp b/addons/hellfire/functions/script_component.hpp
deleted file mode 100644
index 899f29a758..0000000000
--- a/addons/hellfire/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "\z\ace\addons\hellfire\script_component.hpp"
diff --git a/addons/missileguidance/ACE_GuidanceConfig.hpp b/addons/missileguidance/ACE_GuidanceConfig.hpp
index 131beee339..21f526e79f 100644
--- a/addons/missileguidance/ACE_GuidanceConfig.hpp
+++ b/addons/missileguidance/ACE_GuidanceConfig.hpp
@@ -88,6 +88,17 @@ class GVAR(SeekerTypes) {
         functionName = QFUNC(seekerType_MWR);
         onFired = QFUNC(mwr_onFired);
     };
+<<<<<<< HEAD
+=======
+    class DopplerRadar {
+        name = "";
+        visualName = "";
+        description = "";
+
+        functionName = QFUNC(seekerType_Doppler);
+        onFired = QFUNC(doppler_onFired);
+    };
+>>>>>>> 79f28b99e (Isolate doppler)
 };
 
 class GVAR(NavigationTypes) {
diff --git a/addons/missileguidance/XEH_PREP.hpp b/addons/missileguidance/XEH_PREP.hpp
index bc0e551466..ceb8af14e9 100644
--- a/addons/missileguidance/XEH_PREP.hpp
+++ b/addons/missileguidance/XEH_PREP.hpp
@@ -25,7 +25,6 @@ PREP(attackProfile_LIN);
 PREP(attackProfile_LOFT);
 PREP(attackProfile_WIRE);
 PREP(attackProfile_BEAM);
-PREP(attackProfile_JDAM);
 
 // Javelin profiles
 PREP(attackProfile_JAV_DIR);
@@ -51,6 +50,10 @@ PREP(wire_onFired);
 
 // Seeker OnFired
 PREP(SACLOS_onFired);
+<<<<<<< HEAD
+=======
+PREP(doppler_onFired);
+>>>>>>> 79f28b99e (Isolate doppler)
 PREP(mwr_onFired);
 
 // Navigation OnFired
diff --git a/addons/missileguidance/script_component.hpp b/addons/missileguidance/script_component.hpp
index 2ffb589e77..96b9343ddb 100644
--- a/addons/missileguidance/script_component.hpp
+++ b/addons/missileguidance/script_component.hpp
@@ -29,3 +29,7 @@
 #define DEFAULT_LEAD_DISTANCE 5
 #define ACTIVE_RADAR_POLL_FREQUENCY (1 / 7)
 #define ACTIVE_RADAR_MINIMUM_SCAN_AREA 30
+<<<<<<< HEAD
+=======
+
+>>>>>>> 79f28b99e (Isolate doppler)
diff --git a/addons/nlaw/functions/fnc_attackProfile.sqf b/addons/nlaw/functions/fnc_attackProfile.sqf
index 9628974800..ad7622eadd 100644
--- a/addons/nlaw/functions/fnc_attackProfile.sqf
+++ b/addons/nlaw/functions/fnc_attackProfile.sqf
@@ -56,5 +56,5 @@ if ((count _test) > 0) then {
 };
 #endif
 
-// TRACE_1("Adjusted target position",_returnTargetPos);
+// TRACE_1("Adjusted target position", _returnTargetPos);
 _returnTargetPos;