diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d780d3d903..c3b9857530 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -752,15 +752,9 @@
 
   // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
   // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
-<<<<<<< HEAD
   #define DEFAULT_bedKp 65.76
   #define DEFAULT_bedKi 12.45
   #define DEFAULT_bedKd 231.48
-=======
-  #define DEFAULT_bedKp 198.07
-  #define DEFAULT_bedKi 38.68
-  #define DEFAULT_bedKd 676.06
->>>>>>> fa28fff246d08ea8e1a6a6bc1fa4c3c03c0b6c59
 
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
 #endif // PIDTEMPBED