diff --git a/wawi/app.py b/wawi/app.py
index ea02181..40184c1 100755
--- a/wawi/app.py
+++ b/wawi/app.py
@@ -886,13 +886,8 @@ def order():
     db = get_db()
     cursor = db.execute(
         """
-<<<<<<< HEAD
         INSERT INTO orders (name, handy, email, mannschaft, artikel, groesse, menge, notiz, created_at, done, completed_by, completed_at, canceled, canceled_by, canceled_at, payment_method, payment_status)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, NULL, NULL, 0, NULL, NULL, ?, 'unpaid')
-=======
-        INSERT INTO orders (name, handy, mannschaft, artikel, groesse, menge, notiz, created_at, done, completed_by, completed_at, canceled, canceled_by, canceled_at, payment_method, payment_status)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, 0, NULL, NULL, 0, NULL, NULL, ?, 'unpaid')
->>>>>>> origin/main
         """,
         (
             data.get("name"),
@@ -1031,11 +1026,7 @@ def orders():
     """Bestellliste in der Verwaltung."""
     rows = get_db().execute(
         """
-<<<<<<< HEAD
         SELECT id, name, handy, email, mannschaft, artikel, groesse, menge, notiz, created_at, done, completed_by, completed_at, canceled, canceled_by, canceled_at, payment_method, payment_status, paid_at, paid_by
-=======
-        SELECT id, name, handy, mannschaft, artikel, groesse, menge, notiz, created_at, done, completed_by, completed_at, canceled, canceled_by, canceled_at, payment_method, payment_status, paid_at, paid_by
->>>>>>> origin/main
         FROM orders
         ORDER BY id DESC
         LIMIT 500