Resolve conflicts

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/importers/safety_db.py

@@ -139,11 +139,7 @@ def updated_advisories(self) -> Set[Advisory]:
 def categorize_versions(
     package_name: str,
     all_versions: Set[str],
-<<<<<<< HEAD
     version_ranges: Iterable[str],
-=======
-    version_specs: Iterable[str],
->>>>>>> 2d16304805430fa495713c15a798921c69416f35
 ) -> Tuple[Set[PackageURL], Set[PackageURL]]:
     """
     :return: impacted, resolved purls