browserstack
diff --git a/‎config/parallel.testng.xml
-25 b/‎config/parallel.testng.xml
-25
diff --git a/‎config/sample-local-test.testng.xml
-5 b/‎config/sample-local-test.testng.xml
-5
diff --git a/‎config/single.testng.xml
-11 b/‎config/single.testng.xml
-11
diff --git a/‎config/suite.testng.xml
-36 b/‎config/suite.testng.xml
-36
diff --git a/‎src/test/resources/conf/local.conf.json
-20 b/‎src/test/resources/conf/local.conf.json
-20
diff --git a/‎src/test/resources/conf/parallel.conf.json
-29 b/‎src/test/resources/conf/parallel.conf.json
-29
diff --git a/‎src/test/resources/conf/single.conf.json
-20 b/‎src/test/resources/conf/single.conf.json
-20
diff --git a/‎src/test/resources/conf/suite.conf.json
-31 b/‎src/test/resources/conf/suite.conf.json
-31
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Local">
-    <parameter name="config" value="local.conf.json"/>
     <test name="LocalTest">
-<<<<<<< HEAD:config/sample-local-test.testng.xml
-=======
-        <parameter name="environment" value="chrome"/>
->>>>>>> origin:config/local.testng.xml
         <classes>
             <class name="com.browserstack.LocalTest"/>
         </classes>