diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 2f7722f2..61e7ee67 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -108,13 +108,12 @@ void CoreController::performControlOperation() {
   sdStateMachine();
   performMountedSdCardOperations();
   readHkData();
-<<<<<<< HEAD
   if(i2cErrors >= 5) {
     bool protOpPerformed = false;
     triggerEvent(I2C_UNAVAILABLE_REBOOT);
     gracefulShutdownTasks(CURRENT_CHIP, CURRENT_COPY, protOpPerformed);
     std::system("xsc_boot_copy -r");
-=======
+  }
   if (shellCmdIsExecuting) {
     bool replyReceived = false;
     // TODO: We could read the data in the ring buffer and send it as an action data reply.
@@ -127,7 +126,6 @@ void CoreController::performControlOperation() {
       }
       successRecipient = MessageQueueIF::NO_QUEUE;
     }
->>>>>>> origin/develop
   }
   opDivider5.checkAndIncrement();
   opDivider10.checkAndIncrement();