Trying to fix conflicts

announcements/migrations/0004_alter_reaction_announcement.py

+# Generated by Django 4.0.3 on 2022-05-19 17:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0003_reaction_reaction_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reaction',
+            name='announcement',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reacts', to='announcements.announcement'),
+        ),
+    ]

assignments/migrations/0005_alter_assignment_image.py

+# Generated by Django 4.0.3 on 2022-05-19 17:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assignments', '0004_assignment_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='assignment',
+            name='image',
+            field=models.ImageField(upload_to='assignments/'),
+        ),
+    ]

forum/migrations/0012_post_image.py

-<<<<<<< HEAD
-# Generated by Django 4.0.3 on 2022-05-19 16:53
-=======
 # Generated by Django 4.0.3 on 2022-05-19 16:08
->>>>>>> master
 
 from django.db import migrations, models
 
@@ -17,11 +13,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='post',
             name='image',
-<<<<<<< HEAD
-            field=models.ImageField(default=1, upload_to='forum/images/'),
-=======
             field=models.ImageField(default=1, upload_to='images/'),
->>>>>>> master
             preserve_default=False,
         ),
     ]

forum/migrations/0013_alter_post_image.py

-<<<<<<< HEAD
-# Generated by Django 4.0.3 on 2022-05-19 16:58
-=======
-# Generated by Django 4.0.3 on 2022-05-19 16:13
->>>>>>> master
+# Generated by Django 4.0.3 on 2022-05-19 17:30
 
 from django.db import migrations, models
 
@@ -17,10 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='post',
             name='image',
-<<<<<<< HEAD
             field=models.ImageField(upload_to='forum/'),
-=======
-            field=models.ImageField(upload_to='forum/images/'),
->>>>>>> master
         ),
     ]

forum/models.py

@@ -10,11 +10,7 @@ class Post(models.Model):
         'homepage.WidgetUser',
         on_delete=models.CASCADE
     )
-<<<<<<< HEAD
-    image = models.ImageField(upload_to='forum/')
-=======
-    image = models.ImageField(upload_to="forum/images/")
->>>>>>> master
+    image = models.ImageField(upload_to="forum/")
 
     def __str__(self):
         return '{}'.format(self.post_title)