diff --git a/src/activities/boot_sleep/SleepActivity.cpp b/src/activities/boot_sleep/SleepActivity.cpp
index 32ba5db5..c8a6026d 100644
--- a/src/activities/boot_sleep/SleepActivity.cpp
+++ b/src/activities/boot_sleep/SleepActivity.cpp
@@ -19,11 +19,15 @@ void SleepActivity::onEnter() {
       (!fromTimeout && SETTINGS.showSleepScreen == CrossPointSettings::SHOW_SLEEP_SCREEN::EXCEPT_TIMEOUT);
 
   Activity::onEnter();
+<<<<<<< HEAD
 <<<<<<< HEAD
   if (SHOW_SLEEP_SCREEN) {
 =======
   if(SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) {
 >>>>>>> 4709ffb (Remove Entering Sleep message)
+=======
+  if (SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) {
+>>>>>>> b392ba3 (fix formatting issues)
     renderPopup("Entering Sleep...");
   } else {
     return renderLastScreenSleepScreen();