diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
index e603d09fa3..7a6373186d 100644
--- a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
+++ b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
@@ -10,10 +10,7 @@ public BlocksEditorTarget(TargetInfo Target) : base(Target)
         DefaultBuildSettings = BuildSettingsVersion.V5;
         Type = TargetType.Editor;
 		ExtraModuleNames.AddRange(new string[] { "Blocks" });
-<<<<<<< HEAD
         DefaultBuildSettings = BuildSettingsVersion.V4;
-=======
->>>>>>> f5f6cc1d17237900be5e04cfe99ceb9293f1b14b
         //bUseUnityBuild = false;
         //bUsePCHFiles = false;
     }