Final cleanup: remove duplicate conflict code

Author: 1minds3t

src/omnipkg/core.py

@@ -12773,14 +12773,9 @@ def smart_uninstall(
             # 4. Update package-level info based on the final ground truth.
             final_versions_on_disk = {inst.get("Version") for inst in post_deletion_installations}
             versions_to_check = {item.get("Version") for item in final_to_uninstall}
-
-<<<<<<< HEAD
-            for pkg_version in versions_to_check:
-                if pkg_version not in final_versions_on_disk:
-                    safe_print(
-                        f"   -> Last instance of v{version} removed. Updating package version list."
-                    )
             for version in versions_to_check:
+                if version not in final_versions_on_disk:
+                    safe_print(f"   -> Last instance of v{version} removed. Updating package version list.")
                 if version not in final_versions_on_disk:
                     safe_print(f"   -> Last instance of v{version} removed. Updating package version list.")
                     self.cache_client.srem(versions_set_key, version)