[ignore] Rebased to current master Mar 13 2024.

Author: anvitha-jain

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")