diff --git a/setup.cfg b/setup.cfg
index ed35f2e6ee67a2831adc20130554f1d07af8983b..d21d742fb601bcba4f5846c600429993b823932c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,11 @@ 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