Index: AlarmDefs.h
===================================================================
diff -u -r62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d -r9c08374262b6bb13596705c8fb243beacd9224b6
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 9c08374262b6bb13596705c8fb243beacd9224b6)
@@ -225,7 +225,7 @@
     ALARM_ID_DD_CPU_RAM_ERROR                                       = 193,  ///< DD CPU RAM error
     ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED                          = 194,  ///< TD integrity post test fault
     ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED                          = 195,  ///< TD integrity post test fault
-    ALARM_ID_TD_SALINE_BAG_VOLUME_LOW_ALARM                         = 196,  ///< TD saline bag volume low alarm
+    ALARM_ID_TD_EMPTY_SALINE_BAG                                    = 196,  ///< TD saline bag volume low alarm
     ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE                           = 197,  ///< DD D92 pump rpm out of range
     ALARM_ID_TD_PRIME_COMPLETED_MEDIUM                              = 198,  ///< TD prime completed medium priority alarm
     ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS                      = 199,  ///< TD repeated air trap lower events
@@ -330,7 +330,6 @@
     ALARM_ID_FW_RESERVED_298                                        = 298,  ///< FW reserved for use
     ALARM_ID_FW_RESERVED_299                                        = 299,  ///< FW reserved for use
     ALARM_ID_FW_RESERVED_300                                        = 300,  ///< FW reserved for use
->>>>>>> staging
     NUM_OF_ALARM_IDS                                                        ///< Number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                         ///< Type for alarm list enumeration
@@ -701,7 +700,7 @@
     { ALARM_PRIORITY_HIGH,    10,  ALM_SRC_DD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_CPU_RAM_ERROR                                    },
     { ALARM_PRIORITY_HIGH,     1,  ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED                       },
     { ALARM_PRIORITY_HIGH,     1,  ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED                       },
-    { ALARM_PRIORITY_HIGH,   202,  ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_SALINE_BAG_VOLUME_LOW_ALARM                      },
+    { ALARM_PRIORITY_HIGH,   202,  ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_EMPTY_SALINE_BAG                                 },
     { ALARM_PRIORITY_HIGH,   110,  ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE                        },
     { ALARM_PRIORITY_MEDIUM, 590,  ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_TD_PRIME_COMPLETED_MEDIUM                           },
     { ALARM_PRIORITY_HIGH,    17,  ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS                   },
@@ -810,7 +809,6 @@
     { ALARM_PRIORITY_LOW,    999,  ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_298                                     },
     { ALARM_PRIORITY_LOW,    999,  ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_299                                     },
     { ALARM_PRIORITY_LOW,    999,  ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_300                                     },
->>>>>>> staging
 };  //   Priority            Rank  Source      Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr AutoRes ClrOnly TxLog  ID
 
 /// Table of alarms and their rank.
@@ -981,7 +979,7 @@
     { 150, ALARM_ID_DD_BLOOD_LEAK_DETECTED },
     { 200, ALARM_ID_TD_VENOUS_PRESSURE_LOW },
     { 201, ALARM_ID_TD_VENOUS_PRESSURE_HIGH },
-    { 202, ALARM_ID_TD_SALINE_BAG_VOLUME_LOW_ALARM },
+    { 202, ALARM_ID_TD_EMPTY_SALINE_BAG },
     { 202, ALARM_ID_TD_ARTERIAL_PRESSURE_LOW },
     { 203, ALARM_ID_TD_ARTERIAL_PRESSURE_HIGH },
     { 204, ALARM_ID_TD_TMP_PRESSURE_LOW },
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