Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -re668ae1e012a1ab6ed5b1ff62f7001f977049ded -r0efaa7742df2c4138f358784c9f5e3cd68e03201
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision e668ae1e012a1ab6ed5b1ff62f7001f977049ded)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 0efaa7742df2c4138f358784c9f5e3cd68e03201)
@@ -11,7 +11,10 @@
 #
 ############################################################################
 
+<<<<<<< HEAD
 import object
+=======
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
 import names
 import sys
 import squish
@@ -450,6 +453,7 @@
         
     raise LookupError("value object is not in view to the user after " + \
              "trying 100 times")
+<<<<<<< HEAD
     
 
 def expected_heparin_value(val):
@@ -581,6 +585,20 @@
             test.compare(bullet_border_color, config.INCOMPLETE_COLOR)     
     test.endSection()      
             
+=======
+
+def get_bullet_object(screen_obj, num):
+    """
+        To obtain a bullet object based on occurrence provided.
+        @param screen_obj: provides the container on which the bullet must be present
+        @param num: provides the occurrence value 
+        @returns a real name object
+    """     
+    names.o_bullet_object["container"] = screen_obj
+    names.o_bullet_object["occurrence"] = num + 1
+    return names.o_bullet_object 
+
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
 def verify_missing_object(object_to_check):
     """ 
     Method to verify the given object is invisible or is not present on the screen
@@ -593,6 +611,7 @@
     except LookupError as _:
         test.passes("object is not present as expected")
         
+<<<<<<< HEAD
     squish.testSettings.objectNotFoundDebugging = True    
     
 def set_arterial_ranges_min_val(art_low):
@@ -798,3 +817,6 @@
     indicators = object.children(indicator_parent)
     return indicators
 
+=======
+    squish.testSettings.objectNotFoundDebugging = True   
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9