Index: MsgDefs.h
===================================================================
diff -u -rfae8ce873b99a9959dea80185be53bad40fa5c37 -r82fa7ed5f3a375d0d47568de10ceb536a421e90d
--- MsgDefs.h	(.../MsgDefs.h)	(revision fae8ce873b99a9959dea80185be53bad40fa5c37)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 82fa7ed5f3a375d0d47568de10ceb536a421e90d)
@@ -9,7 +9,7 @@
 * @file    MsgDefs.h
 *
 * @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      16-Jun-2026
+* @date    (last)      24-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -404,10 +404,10 @@
     MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D,                 ///< DD conductivity sensor resistance override request
     MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xA05E,                             ///< DD conductivity sensor version request
     MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xA05F,                            ///< DD conductivity sensor version response
-    MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060,           ///< DD bicarb mix volume control kp gain
-    MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061,           ///< DD bicarb mix volume control ki gain
-    MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062,             ///< DD acid mix volume control kp gain
-    MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063,             ///< DD acid mix volume control kp gain
+    MSG_ID_DD_BICARB_MIX_VOL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060,                   ///< DD bicarb mix volume control kp gain
+    MSG_ID_DD_BICARB_MIX_VOL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061,                   ///< DD bicarb mix volume control ki gain
+    MSG_ID_DD_ACID_MIX_VOL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062,                     ///< DD acid mix volume control kp gain
+    MSG_ID_DD_ACID_MIX_VOL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063,                     ///< DD acid mix volume control kp gain
     MSG_ID_DD_ACID_MIX_VOL_OVERRIDE_REQUEST = 0xA064,                                   ///< DD acid mix volume override
     MSG_ID_DD_BICARB_MIX_VOL_OVERRIDE_REQUEST = 0xA065,                                 ///< DD bicarb mix volume override
     MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA066,                     ///< DD bicarb target conductivity override
@@ -423,9 +423,14 @@
     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_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