Fix merge conflicts

aleksis/apps/paweljong/models.py

@@ -275,7 +275,8 @@ class EventRegistration(ExtensibleModel):
         blank=True,
     )
 
-<<<<<<< HEAD
+    states = models.ManyToManyField(RegistrationState, verbose_name=_("States"), related_name="registrations")
+
     def get_invoice(self):
         # FIXME Maybe do not hard-code this
         client, __ = Client.objects.get_or_create(name="Teckids e.V.")
@@ -320,9 +321,6 @@ class EventRegistration(ExtensibleModel):
             total += item.price
             tax += item.price / (item.tax_rate + 100) * item.tax_rate
         return total, tax
-=======
-    states = models.ManyToManyField(RegistrationState, verbose_name=_("States"), related_name="registrations")
->>>>>>> master
 
     def __str__(self) -> str:
         return f"{self.event}, {self.person.first_name} {self.person.last_name}"