Fix merge conflict and Update migration file

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

…ilities/migrations/0104_detectionrule.py …ilities/migrations/0106_detectionrule.pyvulnerabilities/migrations/0104_detectionrule.py renamed to vulnerabilities/migrations/0106_detectionrule.py vulnerabilities/migrations/0104_detectionrule.py renamed to vulnerabilities/migrations/0106_detectionrule.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.25 on 2025-12-04 00:14
+# Generated by Django 4.2.25 on 2025-12-16 13:02
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("vulnerabilities", "0103_codecommit_impactedpackage_affecting_commits_and_more"),
+        ("vulnerabilities", "0105_packagecommitpatch_patch_and_more"),
     ]
 
     operations = [