diff --git a/setup.cfg b/setup.cfg
index d21d742fb601bcba4f5846c600429993b823932c..3fd66934bf6ec15ede95c42bab17fdfce248311e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,11 +18,7 @@ addopts = --verbose
           --cov-report=term 
           --cov-report=html 
           --cov-report=xml 
-<<<<<<< HEAD
           --junitxml=build/reports/unit-tests.xml
-=======
-          --junitxml=build/reports/csp-lmc-subelement-unit-tests.xml
->>>>>>> 01be27bd23e5ee3a505cb60164fa874fe0efbbc7
 
 junit_family=legacy
 console_output_style = progress