diff --git a/automation/Object Repository/NewUser/addUser.rs b/automation/Object Repository/NewUser/addUser.rs
index 842a682990d8e8efb2eeb1d33b87d66dc105d4e7..a33b2349946c3274bfc66c1f7dfea9baf220d79b 100644
--- a/automation/Object Repository/NewUser/addUser.rs	
+++ b/automation/Object Repository/NewUser/addUser.rs	
@@ -6,20 +6,17 @@
    <elementGuidId>603be35e-a2f1-4b42-9155-c50663f2f154</elementGuidId>
    <selectorCollection>
       <entry>
-<<<<<<< HEAD
          <key>CSS</key>
          <value>button[data-test=&quot;button-add-user&quot;]</value>
       </entry>
       <entry>
          <key>XPATH</key>
-=======
          <key>XPATH</key>
          <value>//button/*[1]</value>
       </entry>
       <entry>
          <key>CSS</key>
          <value>button:first-child</value>
->>>>>>> e85cabdf8bb80ea1284bf832b47b990be81d0c03
       </entry>
    </selectorCollection>
    <selectorMethod>XPATH</selectorMethod>
diff --git a/automation/Object Repository/NewUser/adminButton.rs b/automation/Object Repository/NewUser/adminButton.rs
index 01b317e005ea1fd7db52d4fcf1dd1ab91e7c0dfa..196272563833bb690f72059c67a39e962637fb29 100644
--- a/automation/Object Repository/NewUser/adminButton.rs	
+++ b/automation/Object Repository/NewUser/adminButton.rs	
@@ -6,19 +6,16 @@
    <elementGuidId>9be9ae36-fc08-41ea-9e5e-66e6b3424324</elementGuidId>
    <selectorCollection>
       <entry>
-<<<<<<< HEAD:automation/Object Repository/NewUser/adminButton.rs
          <key>CSS</key>
       </entry>
       <entry>
          <key>XPATH</key>
          <value>//*[@id=&quot;root&quot;]/div/div/div[1]/div[2]/div/span[2]</value>
-=======
          <key>XPATH</key>
          <value>//span[contains(text(),'admin')]</value>
       </entry>
       <entry>
          <key>CSS</key>
->>>>>>> e85cabdf8bb80ea1284bf832b47b990be81d0c03:automation/Object Repository/NewUser/admin.rs
       </entry>
    </selectorCollection>
    <selectorMethod>XPATH</selectorMethod>