diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h
index ac4a3b5a1f..13ff2ece27 100644
--- a/Marlin/_Statusscreen.h
+++ b/Marlin/_Statusscreen.h
@@ -76,6 +76,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 #define STATUS_HEATERS_X      48
 #define STATUS_BED_X          70
 =======
@@ -94,3 +95,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