Index: shared/scripts/configuration/strings.py
===================================================================
diff -u -r993645b00fe6db65799c8d8c93bfd2b864cb2d37 -rdd182e384d5248240f343cc4855ff292ba5e4ee3
--- shared/scripts/configuration/strings.py	(.../strings.py)	(revision 993645b00fe6db65799c8d8c93bfd2b864cb2d37)
+++ shared/scripts/configuration/strings.py	(.../strings.py)	(revision dd182e384d5248240f343cc4855ff292ba5e4ee3)
@@ -17,6 +17,15 @@
 PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"]
 POST_TREATMENT_SCREENS = ["Disconnection", "Review", "Disposables", "Disinfection"]  
 
+<<<<<<< HEAD
+BLOOD_PRIMING_TEXT = "Blood Priming"
+SALINE_UNIT = "mL"
+BLOOD_PRIMING_UNIT = "mL" 
+BLOOD_PRIMING_VALUE_0 = "0"
+BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + BLOOD_PRIMING_UNIT
+
+=======
+>>>>>>> 993645b00fe6db65799c8d8c93bfd2b864cb2d37
 #UF treatment 
 ULTRAFILTRATION_PAUSED_TEXT = "Ultrafiltration Paused"
 RESUME_TEXT = "RESUME ULTRAFILTRATION"