Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r7d92d650e89c926358babdf7e5763cdb7891aa0b -r865a03807c6a5a00de285feaedb0b6a211b49d45
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 7d92d650e89c926358babdf7e5763cdb7891aa0b)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 865a03807c6a5a00de285feaedb0b6a211b49d45)
@@ -792,6 +792,7 @@
     
     logs are automatically created in path :"/home/denali/Desktop/sd-card/log/*.log". 
     
+<<<<<<< HEAD
     In row[index], index represent column to be extracted.   
     @param message_ack - (bool) 'True' - if ack is satisfied in log / 'False' - if ack condition is not satisfied
     @param message_text - (string) message text to be extracted from log.
@@ -924,15 +925,16 @@
         bullet_border_color = bullet_children[0].border.color.name
         step_title =  squish.waitForObjectExists(get_text_object(screen_obj, config.POST_TREATMENT_SCREENS[page])) 
         
-        if page < post_treatment_step:
-            test.log("To verify the step indicator of the completed post-treatment screen " + config.POST_TREATMENT_SCREENS[page]) 
+        if page < treatment_step:
+            test.log("To verify the step indicator of the completed treatment screen " + treatment_screens[page]) 
             test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current)
             test.compare(bullet_circle_color, config.COMPLETE_COLOR, " the bullet color must be " + str(config.COMPLETE_COLOR))
             test.compare(bullet_border_color, config.COMPLETE_COLOR," the bullet border color must be " + str(config.COMPLETE_COLOR)) 
             test.compare(step_title.color.name, config.ENABLED_COLOR, " the text color must be " + str(config.ENABLED_COLOR))
 
-        elif page == post_treatment_step:
+        elif page == treatment_step:
+
             test.log("To verify the step indicators of the current treatment screen " + treatment_screens[page]) 
             test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)