diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index b84f07d6..c2fc8cde 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -110,7 +110,6 @@ void ThermalController::performControlOperation() {
     deviceTemperatures.commit();
   }
 
-<<<<<<< HEAD
   {
     PoolReadGuard pg(&heaterInfo);
     if (pg.getReadResult() == returnvalue::OK) {
@@ -122,7 +121,7 @@ void ThermalController::performControlOperation() {
       }
     }
   }
-=======
+
   ctrlCameraBody();
   ctrlAcsBoard();
   ctrlMgt();
@@ -147,7 +146,6 @@ void ThermalController::performControlOperation() {
   ctrlTx();
   ctrlMpa();
   ctrlScexBoard();
->>>>>>> origin/develop
 }
 
 ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,