diff --git a/plugins/module_utils/aci.py b/plugins/module_utils/aci.py
index 28e3e4ef4..d567089c6 100644
--- a/plugins/module_utils/aci.py
+++ b/plugins/module_utils/aci.py
@@ -1673,7 +1673,6 @@ def dump_json(self):
                     if self.result.get("changed") is True:
                         json.dump([mo], output_file)
 
-<<<<<<< HEAD
     def parsed_url_path(self, url):
         if not HAS_URLPARSE:
             self.fail_json(msg="urlparse is not installed")