diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h
index bf87527002..f5ebc13043 100644
--- a/Marlin/_Statusscreen.h
+++ b/Marlin/_Statusscreen.h
@@ -74,6 +74,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
 // 
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 #define STATUS_HEATERS_X      48
 #define STATUS_BED_X          70
 =======
@@ -84,3 +85,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
 #define STATUS_HEATERS_X      48  //48
 #define STATUS_BED_X          70 //74
 >>>>>>> Stashed changes
+=======
+#define STATUS_HEATERS_X      48  //48
+#define STATUS_BED_X          70 //74
+>>>>>>> Stashed changes