Index: AlarmDefs.h
===================================================================
diff -u -ra1162deed63c9b2d4b5f756495ebc0aea09b0ef0 -r3c9bb42a452e32249709a5c347ad62a798b1f143
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision a1162deed63c9b2d4b5f756495ebc0aea09b0ef0)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 3c9bb42a452e32249709a5c347ad62a798b1f143)
@@ -168,6 +168,9 @@
     ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130,                  ///< HD cartridge installed improperly alarm
     ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131,                  ///< HD rinseback volume check failure
     ALARM_ID_NO_CARTRIDGE_LOADED = 132,                             ///< HD no cartridge loaded alarm
+<<<<<<< HEAD
+    ALARM_ID_HD_FLUID_LEAK_DETECTED = 133,                          ///< HD fluid leak detected alarm
+=======
     ALARM_ID_END_TREATMENT_TIMEOUT_ALARM = 133,                     ///< HD end treatment sub-mode timeout alarm
     ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 134,                ///< HD blood prime volume check failure
     ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH = 135,                  ///< HD dialysate temperature too high alarm
@@ -182,6 +185,7 @@
     ALARM_ID_HD_AC_POWER_LOST = 144,                                ///< HD AC power lost alarm
     ALARM_ID_DG_RESTARTED_FAULT = 145,                              ///< HD reports DG restarted fault
     ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146,             ///< Dialysate conductivity out of range
+>>>>>>> 76956f3c821a4751fee467fc897de72beeb5df7f
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration