Index: MsgDefs.h
===================================================================
diff -u -r82fa7ed5f3a375d0d47568de10ceb536a421e90d -r0bbbf45fed1ea9c21069f348c9540d385a89709b
--- MsgDefs.h	(.../MsgDefs.h)	(revision 82fa7ed5f3a375d0d47568de10ceb536a421e90d)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 0bbbf45fed1ea9c21069f348c9540d385a89709b)
@@ -351,6 +351,7 @@
     MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027,                        ///< DD TD CAN Communication status override request
     MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028,                                 ///< DD operation mode status override request
     MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029,                             ///< DD set new operation mode override request
+    MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02A,                                ///< DD ultrafiltration data publish interval override request
     MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B,                     ///< DD dialysate pumps start/stop override request
     MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C,                         ///< DD generate dialysate mode data publish interval override request
     MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D,                   ///< DD Concentrate pumps start/stop override request
@@ -423,14 +424,9 @@
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070,                                 ///< DD conductivity sensor cal request
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071,                                ///< DD conductivity sensor cal response
     MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072,                                             ///< DD mixing control publish data 
-<<<<<<< HEAD
-    MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA073,                               ///< DD Treatment parameters override request
-    MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA074,                                ///< DD ultrafiltration data publish interval override request
-
-=======
     MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA073,           ///< DD DD mixing control broadcast data overrride request
     MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST = 0xA074,                    ///< DD dry bicart depressurise overrride request
->>>>>>> staging
+    MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA075,                               ///< DD Treatment parameters override request
 
     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