Resolve merge conflict in urls.py

core/apps/api/migrations/0014_admodel_description.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.7 on 2025-11-28 11:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0013_alter_feedback_comment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='admodel',
+            name='description',
+            field=models.TextField(default=1, verbose_name='Description'),
+            preserve_default=False,
+        ),
+    ]

core/apps/api/migrations/0015_alter_adoption_ad.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.7 on 2025-11-28 11:45
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0014_admodel_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adoption',
+            name='ad',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='options', to='api.admodel', verbose_name='Ad'),
+        ),
+    ]