diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h
index 94b841a740..bf87527002 100644
--- a/Marlin/_Statusscreen.h
+++ b/Marlin/_Statusscreen.h
@@ -73,9 +73,14 @@ const unsigned char status_logo_bmp[] PROGMEM = {
 #define STATUS_BED_ANIM
 // 
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 #define STATUS_HEATERS_X      48
 #define STATUS_BED_X          70
 =======
 #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