Index: shared/scripts/names.py
===================================================================
diff -u -re7d664399195ffd57a11514853ed7a6699ef8361 -r230a9b2228e1372d2d608b350c8ad79476174b2a
--- shared/scripts/names.py	(.../names.py)	(revision e7d664399195ffd57a11514853ed7a6699ef8361)
+++ shared/scripts/names.py	(.../names.py)	(revision 230a9b2228e1372d2d608b350c8ad79476174b2a)
@@ -224,7 +224,6 @@
 o_dialysate_flow_maximum_value = {"container": o_Overlay, "occurrence": 2, "text": "0mL/min", "type": "Text", "unnamed": 1, "visible": True}
 o_handler_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
-<<<<<<< HEAD
 
 
 #vitals