diff --git a/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp
index 8b9567b6b8..cd3059bc8c 100644
--- a/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp
@@ -1512,11 +1512,7 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
       {
         if(
           #if (FIL_RUNOUT_STATE == LOW)
-<<<<<<< HEAD
             #define FIL_RUNOUT_INVERTING false
-=======
-            #define FIL_RUNOUT_INVERTING true
->>>>>>> 6f5430f00aeb765aa1a63b2db9950f48fd85e95d
           #endif
         #if DISABLED(FILAMENT_RUNOUT_SENSOR) || ENABLED(FILAMENT_MOTION_SENSOR)
           true