diff --git a/linux/payload/plocMpscoDefs.h b/linux/payload/plocMpscoDefs.h
index 3d74fe0d..27bef077 100644
--- a/linux/payload/plocMpscoDefs.h
+++ b/linux/payload/plocMpscoDefs.h
@@ -127,10 +127,7 @@ static const uint16_t ACK_FAILURE = 0x401;
 static const uint16_t EXE_SUCCESS = 0x402;
 static const uint16_t EXE_FAILURE = 0x403;
 static const uint16_t TM_MEMORY_READ_REPORT = 0x404;
-<<<<<<< HEAD
 static const uint16_t TM_FLASH_READ_REPORT = 0x405;
-=======
->>>>>>> origin/v2.1.0-dev
 static constexpr uint16_t TM_FLASH_DIRECTORY_CONTENT = 0x406;
 static const uint16_t TM_CAM_CMD_RPT = 0x407;
 static constexpr uint16_t TM_HK_GET_REPORT = 0x408;
@@ -675,21 +672,13 @@ class TcGetDirContent : public TcBase {
 
   ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) {
     ReturnValue_t result = returnvalue::OK;
-<<<<<<< HEAD
-    spParams.setFullPayloadLen(commandDataLen + sizeof(NULL_TERMINATOR) + CRC_SIZE);
-=======
     // Yeah it needs to be 256.. even if the path is shorter.
     spParams.setFullPayloadLen(256 + CRC_SIZE);
->>>>>>> origin/v2.1.0-dev
     if (result != returnvalue::OK) {
       return result;
     }
     std::memcpy(payloadStart, commandData, commandDataLen);
-<<<<<<< HEAD
-    *(payloadStart + commandDataLen) = NULL_TERMINATOR;
-=======
     payloadStart[255] = '\0';
->>>>>>> origin/v2.1.0-dev
     return result;
   }
 };