mucked up conflict resolution :/

Author: laurenpudz

server/game_dev/models.py

@@ -77,23 +77,6 @@ class CompletionStatus(models.IntegerChoices):
     thumbnail = models.ImageField(upload_to="games/", null=True)
     event = models.ForeignKey(Event, on_delete=models.SET_NULL, null=True, blank=True)
 
-    itchGameEmbedID = models.PositiveBigIntegerField(
-        default=None,
-        null=True,
-        blank=True,
-        help_text="If a game is playable and has a web demo stored on itch.io, please enter the embed developer ID"
-    )
-
-    itchGameWidth = models.PositiveBigIntegerField(
-        default=0
-    )
-    itchGameHeight = models.PositiveBigIntegerField(
-        default=0
-    )
-
-    thumbnail = models.ImageField(upload_to="games/", null=True)
-    event = models.ForeignKey(Event, on_delete=models.SET_NULL, null=True, blank=True)
-
     def __str__(self):
         return str(self.name)