Index: AlarmDefs.h
===================================================================
diff -u -r332637491b7c39fcf5275a8587cd3f32e6b2dbbe -r5550d0b88a5c5686b920ce0f71e60eb9e3e214b6
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 332637491b7c39fcf5275a8587cd3f32e6b2dbbe)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 5550d0b88a5c5686b920ce0f71e60eb9e3e214b6)
@@ -592,7 +592,7 @@
     { ALARM_PRIORITY_HIGH,    21,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_OCCLUSION_BLOOD_PUMP,                             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    21,  FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE,  ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRIFT_TIMEOUT,   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,     21,  FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC,                  0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,    22,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE,                   0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE,  TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    23,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE,              0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    24,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE,  TRUE,  TRUE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    26,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_HIGH_TEMPERATURE,                     0,              ALARM_ID_NO_ALARM },
@@ -691,7 +691,7 @@
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_NO_CARTRIDGE_LOADED,                              0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE,                        0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,   999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE,                 0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE,  TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT,                       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT,                        0,              ALARM_ID_NO_ALARM },
@@ -907,6 +907,8 @@
     {   3, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT },
     {   3, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE },
     {   3, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT },
+    {   3, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE },
+    {   3, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE },
     {   4, ALARM_ID_END_OF_TREATMENT_HIGH },
     {   5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK },
     {   6, ALARM_ID_HD_BLOOD_LEAK_DETECTED },
@@ -928,7 +930,6 @@
     {  21, ALARM_ID_OCCLUSION_BLOOD_PUMP },
     {  21, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRIFT_TIMEOUT },
     {  21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC },
-    {  22, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE },
     {  23, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE },
     {  24, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT },
     {  26, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE },
@@ -1026,7 +1027,6 @@
     { 999, ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT },
     { 999, ALARM_ID_NO_CARTRIDGE_LOADED },
     { 999, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE },
-    { 999, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE },
     { 999, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT },
     { 999, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT },
     { 999, ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT },