Resolve migration conflicts

hypha/apply/projects/migrations/0054_paf_reviewers_roles__alter_project_status.py → hypha/apply/projects/migrations/0055_alter_project_status_add_pafreviewersrole.py

-# Generated by Django 3.2.13 on 2022-07-14 12:46
+# Generated by Django 3.2.14 on 2022-08-09 04:59
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -8,10 +8,15 @@ import modelcluster.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('application_projects', '0053_projectapprovalform'),
+        ('application_projects', '0054_alter_project_form_fields'),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='project',
+            name='paf_reviews_meta_data',
+            field=models.JSONField(default=dict, help_text='Reviewers role and their actions/comments'),
+        ),
         migrations.AlterField(
             model_name='project',
             name='status',

hypha/apply/projects/migrations/0055_project_paf_reviews_meta_data.py

-# Generated by Django 3.2.13 on 2022-07-18 13:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('application_projects', '0054_paf_reviewers_roles__alter_project_status'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='project',
-            name='paf_reviews_meta_data',
-            field=models.JSONField(default=dict, help_text='Reviewers role and their actions/comments'),
-        ),
-    ]