Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -ra99ec835a8fee700e0dbab06dc8abc36e431b3bd -r27c834ccd6f2f96a504ef67f7b834c9593d3860c
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision a99ec835a8fee700e0dbab06dc8abc36e431b3bd)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 27c834ccd6f2f96a504ef67f7b834c9593d3860c)
@@ -877,13 +877,8 @@
         time in application
         @param screen_title - (str) current title of the screen
         @param time_out - (int) time out duration in secs
-<<<<<<< HEAD
         @Param hd_simulator - Instance of class HDSimulator
         @Param dg_simulator - Instance of class DGSimulator
-=======
-        @Param hd_simulator - Instance of HDSimulator class
-        @Param dg_simulator - Instance of DGSimulator class
->>>>>>> pre_treatment_disposables
     """
     test.startSection("Verify the count down time in application")
     for count_down in range(config.COUNT_DOWN_TIME_100, config.MINIMUM_COUNTDOWN_TIME-1, -1):
@@ -1118,7 +1113,7 @@
     names.o_bullet_object["container"] = screen_obj
     names.o_bullet_object["occurrence"] = num + 1
     return names.o_bullet_object  
- 
+
 def keypad_input(key_value):
     """
     Method to enter values using application UI keyboard
@@ -1180,4 +1175,3 @@
 def expected_heparin_value(val):
     names.o_heparin_value["text"] = val
     return names.o_heparin_value
-