Index: MsgDefs.h
===================================================================
diff -u -r62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d -r9c08374262b6bb13596705c8fb243beacd9224b6
--- MsgDefs.h	(.../MsgDefs.h)	(revision 62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 9c08374262b6bb13596705c8fb243beacd9224b6)
@@ -210,15 +210,9 @@
     MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2,                                  ///< TD response to pause/resume Heparin delivery request
     MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3,                                   ///< FFU signal TD update is available.
     MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4,                                   ///< FFU signal DD update is available.
-<<<<<<< HEAD
-    //MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5,                                        ///< DD substitution pump broadcast data.
-    MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5,				                ///< TD request for genric ui confirmation
-    MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6,			                ///< UI generic confirmation result to TD
-=======
     MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5,                               ///< TD request for generic UI confirmation.
     MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6,                          ///< UI generic confirmation result to TD.
     MSG_ID_AVAILABLE_B7 = 0xB7,                                                     ///< Msg ID not used - available for use.
->>>>>>> staging
     MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8,                                     ///< UI vitals adjustment request
     MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE  = 0xB9,                                   ///< TD vitals adjustment response
     MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6,                  ///< UI setup connection confirmation request