Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r865a03807c6a5a00de285feaedb0b6a211b49d45 -r20f65a6962ed2acb2cef7c43ed5e21b23dbe135d
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 865a03807c6a5a00de285feaedb0b6a211b49d45)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 20f65a6962ed2acb2cef7c43ed5e21b23dbe135d)
@@ -516,15 +516,16 @@
 def verify_page_step_indicator(screen_obj, treatment_step, treatment_screens):
     """    
     Method to verify the Page Step indicators [the object on top of the screen which indicates the steps passed, current, remained]
-    @param treatment_step : (int) indicates the Current treatment step 
-    """    
+    @param treatment_step : indicates the Current treatment step 
+    """  
 
     test.startSection("verification of page step indicators")
     for page in range(len(treatment_screens)):
         bullet_children = object.children(squish.waitForObjectExists(get_bullet_object(screen_obj, page)))
         bullet_circle_color = bullet_children[0].color.name 
         bullet_border_color = bullet_children[0].border.color.name
         step_title =  squish.waitForObjectExists(get_text_object(screen_obj, treatment_screens[page])) 
+
         #To verify the step indicators of the completed treatment screens
         if page < treatment_step:
             test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)
@@ -534,7 +535,7 @@
             test.compare(step_title.color.name,config.ENABLED_COLOR)
         #To verify the step indicators of the current treatment screen
         elif page == treatment_step:
-            test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current,)
+            test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)
             test.compare(bullet_circle_color, config.CURRENT_COLOR)
             test.compare(bullet_border_color, config.COMPLETE_COLOR)
@@ -789,10 +790,7 @@
 def get_current_log_details(message_ack = False, message_text = None):
     """
     This function is capable to perform data analysis from application log folder. 
-    
     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.
@@ -822,9 +820,7 @@
 def get_extracted_error_file():
     """
     This function is the handler for getting error file from service folder. 
-     
     Application log file is automatically created on '/home/denali/Desktop/sd-card/service/ {current_date}_denaliSquish.err                        '
-    
     @return latest_file - (string) returns latest file that append on log folder from service
     """
     try: