Index: AlarmDefs.h
===================================================================
diff -u -r6b7b39ca05636f3c413b46934e90ac315fa1fb75 -radbfcaa3cc2520fa20a7e95794537db710febf02
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 6b7b39ca05636f3c413b46934e90ac315fa1fb75)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision adbfcaa3cc2520fa20a7e95794537db710febf02)
@@ -1449,7 +1449,6 @@
  { 298 , ALARM_ID_FW_RESERVED_298                                      , "TD    | Service Required: Hemodialysis Device   | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                           | TD Fault: RESERVED                       | RESERVED                                                                                                                                  | RESERVED                                                                                                                                                                                                                                                                         | "},
  { 299 , ALARM_ID_FW_RESERVED_299                                      , "TD    | Service Required: Hemodialysis Device   | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                           | TD Fault: RESERVED                       | RESERVED                                                                                                                                  | RESERVED                                                                                                                                                                                                                                                                         | "},
  { 300 , ALARM_ID_FW_RESERVED_300                                      , "TD    | Service Required: Hemodialysis Device   | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                           | TD Fault: RESERVED                       | RESERVED                                                                                                                                  | RESERVED                                                                                                                                                                                                                                                                         | "},
->>>>>>> origin/staging
 };
 #endif  // manual alarms
 
Index: MsgDefs.h
===================================================================
diff -u -r6b7b39ca05636f3c413b46934e90ac315fa1fb75 -radbfcaa3cc2520fa20a7e95794537db710febf02
--- MsgDefs.h	(.../MsgDefs.h)	(revision 6b7b39ca05636f3c413b46934e90ac315fa1fb75)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision adbfcaa3cc2520fa20a7e95794537db710febf02)
@@ -591,7 +591,6 @@
     REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH = 59,                               ///< Confirmed value does not match validated value
     REQUEST_REJECT_REASON_INVALID_TREATMENT_SUB_STATE = 60,                         ///< Request is not allowed in current treatment sub-state
     REQUEST_REJECT_REASON_MODALITY_MISMATCH = 61,                                   ///< Mismatched modality (Rx entered vs reatment initiation modality )
-    REQUEST_REJECT_REASON_SYSTEM_IN_OPERATIONMODE = 62,                             ///< Request is not allowed in current mode, to shutdown the System.
     NUM_OF_REQUEST_REJECT_REASONS                                                   ///< Number of settings change reject codes
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;                   ///< Type for settings change rejection reason codes enumeration