diff --git a/README.md b/README.md
index 73845e41..b4e5acab 100644
--- a/README.md
+++ b/README.md
@@ -579,4 +579,10 @@ Eclipse indexer.
 Get info about ttyUL* devices
 ````
 cat /proc/tty/driver
+````
+
+## Useful Q7S Linux Commands
+Rebooting currently running image:
+````
+xsc_boot_copy -r
 ````
\ No newline at end of file
diff --git a/mission/devices/PlocHandler.cpp b/mission/devices/PlocHandler.cpp
index 802c26e5..38c835dc 100644
--- a/mission/devices/PlocHandler.cpp
+++ b/mission/devices/PlocHandler.cpp
@@ -106,8 +106,21 @@ ReturnValue_t PlocHandler::scanForReply(const uint8_t *start,
 		break;
 	case(PLOC::APID_ACK_FAILURE):
         *foundLen = PLOC::SIZE_ACK_REPORT;
+<<<<<<< Updated upstream
 	    *foundId = rememberCommandId;
 	    break;
+=======
+		break;
+	case(PLOC::TM_READ_REPORT):
+        *foundLen = PLOC::SIZE_ACK_REPORT;
+		break;
+	case(PLOC::EXE_SUCCESS):
+        *foundLen = PLOC::SIZE_EXE_REPORT;
+		break;
+	case(PLOC::EXE_FAILURE):
+        *foundLen = PLOC::SIZE_EXE_REPORT;
+		break;
+>>>>>>> Stashed changes
 	default:
         sif::debug << "PlocHandler::scanForReply: Reply has invalid apid" << std::endl;
         return IGNORE_REPLY_DATA;
diff --git a/mission/devices/devicedefinitions/PlocDefinitions.h b/mission/devices/devicedefinitions/PlocDefinitions.h
index 89cef3da..fdcae741 100644
--- a/mission/devices/devicedefinitions/PlocDefinitions.h
+++ b/mission/devices/devicedefinitions/PlocDefinitions.h
@@ -10,6 +10,14 @@ namespace PLOC {
     static const DeviceCommandId_t NONE = 0x0;
     static const DeviceCommandId_t TC_MEM_WRITE = 0x714;
     static const DeviceCommandId_t TC_MEM_READ = 0x715;
+<<<<<<< Updated upstream
+=======
+    static const DeviceCommandId_t ACK_SUCCESS = 0x400;
+    static const DeviceCommandId_t ACK_FAILURE = 0x401;
+    static const DeviceCommandId_t EXE_SUCCESS = 0x402;
+    static const DeviceCommandId_t EXE_FAILURE = 0x403;
+    static const DeviceCommandId_t TM_READ_REPORT = 0x404;
+>>>>>>> Stashed changes
 
     static const uint16_t SIZE_ACK_REPORT = 14;
     static const uint16_t SIZE_EXE_REPORT = 14;