Index: MsgDefs.h
===================================================================
diff -u -rd8aab4af568e74f6b7f86cfbca774f61a4388fd1 -r44eef67220bd6a1dcf06ee5b8599633e2fb5f451
--- MsgDefs.h	(.../MsgDefs.h)	(revision d8aab4af568e74f6b7f86cfbca774f61a4388fd1)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 44eef67220bd6a1dcf06ee5b8599633e2fb5f451)
@@ -260,11 +260,10 @@
     MSG_ID_DD_AVAILABLE_TO_USE_2 = 0xA040,                                          ///< DD stop pre-gen dialysate mode override request
     MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041,                                          ///< DD stop gen dialysate mode override request
     MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042,                            ///< DD set/reset safety shutdown override request
-<<<<<<< HEAD
     MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043,                                      ///< DD set test configuration
     MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044,                                      ///< DD get test configuration
     MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045,                               ///< DD reset all the configurations
-=======
+    MSG_ID_AVAILABLE_1 = 0xA046,                                                    ///< Msg ID not used - available for use.
     MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047,           ///< DD blood leak data publish interval override request
     MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048,                          ///< DD blood leak status override request
     MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049,                     ///< DD blood leak set to embedded mode request
@@ -278,7 +277,6 @@
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01,                     ///< DD piston pump start/stop override request
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02,            ///< DD piston pump fill after dispense control
 #endif
->>>>>>> staging
 
     MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000,                                        ///< First FP test message ID
     MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE,                ///< FP tester log-in