diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp
index 7bfa09d3..a0fd8f53 100644
--- a/linux/devices/ploc/PlocMPSoCHandler.cpp
+++ b/linux/devices/ploc/PlocMPSoCHandler.cpp
@@ -685,7 +685,11 @@ ReturnValue_t PlocMPSoCHandler::handleCamCmdRpt(const uint8_t* data) {
       reinterpret_cast<const char*>(dataFieldPtr),
       tmCamCmdRpt.rememberSpacePacketSize - mpsoc::SPACE_PACKET_HEADER_SIZE - sizeof(uint16_t) - 3);
 #if OBSW_DEBUG_PLOC_MPSOC == 1
+<<<<<<< HEAD
   uint8_t ackValue = *(packetReader.getPacketData() + packetReader.getPacketDataLen() - 2);
+=======
+  uint8_t ackValue = *(packetReader.getFullData() + packetReader.getFullPacketLen() - 2);
+>>>>>>> 9eb21079 (fix)
   sif::info << "PlocMPSoCHandler: CamCmdRpt message: " << camCmdRptMsg << std::endl;
   sif::info << "PlocMPSoCHandler: CamCmdRpt Ack value: 0x" << std::hex
             << static_cast<unsigned int>(ackValue) << std::endl;
diff --git a/tmtc b/tmtc
index 00e99292..1b39bb2a 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 00e99292cc158a347f485507537fa5b63262243b
+Subproject commit 1b39bb2ad2421db89487b4ea352edbd4d420b9b1