Index: AlarmDefs.h
===================================================================
diff -u -r3c9bb42a452e32249709a5c347ad62a798b1f143 -r7af15a8596656036fead5a33db6ebc23b5a56b61
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 3c9bb42a452e32249709a5c347ad62a798b1f143)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 7af15a8596656036fead5a33db6ebc23b5a56b61)
@@ -168,9 +168,6 @@
     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
@@ -185,7 +182,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
+    ALARM_ID_HD_FLUID_LEAK_DETECTED = 147,                          ///< HD fluid leak detected alarm
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -438,6 +435,7 @@
     { ALARM_PRIORITY_HIGH,    15,   0,              ALARM_ID_NO_ALARM,              FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }, // ALARM_ID_HD_AC_POWER_LOST
     { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,              TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_RESTARTED_FAULT
     { ALARM_PRIORITY_LOW,     30,   0,              ALARM_ID_NO_ALARM,              FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE
+    { ALARM_PRIORITY_HIGH,    36,   0,              ALARM_ID_NO_ALARM,              FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_FLUID_LEAK_DETECTED
     // Priority              Rank   Escalate In     Escalate To                     Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };