Index: AlarmDefs.h
===================================================================
diff -u -r6ef36d1727d845984101852ea433cf5198db8d81 -r775cb8800dfc21dafc9ca4f1350672357b27c37d
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 6ef36d1727d845984101852ea433cf5198db8d81)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 775cb8800dfc21dafc9ca4f1350672357b27c37d)
@@ -486,11 +486,7 @@
     { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED,        0,              ALARM_ID_NO_ALARM },
-<<<<<<< Updated upstream
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT,                   0,              ALARM_ID_NO_ALARM },
-=======
-    { ALARM_PRIORITY_HIGH,     1,  TRUE,  TRUE,  TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE,                                       0,              ALARM_ID_NO_ALARM },
->>>>>>> Stashed changes
     { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD,       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SOFTWARE_FAULT,                                0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,                      0,              ALARM_ID_NO_ALARM },
@@ -768,7 +764,6 @@
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM,                                0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC,                        0,              ALARM_ID_NO_ALARM },
-<<<<<<< Updated upstream
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT,                        0,              ALARM_ID_NO_ALARM },
@@ -803,10 +798,6 @@
     {   1, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD },
     {   1, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD },
     {   1, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD },
-<<<<<<< Updated upstream
-=======
-    {   1, ALARM_ID__AVAILABLE },
->>>>>>> Stashed changes
     {   1, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD },
     {   1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED },
     {   1, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED },