diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 9693cbcae1..e8b60eb84d 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -130,7 +130,6 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: aunitl1.aud
-<<<<<<< HEAD
 	DebugAircraftFacing:
 	DebugAircraftSubPxX:
 	DebugAircraftSubPxY: