fixing conflict

schema/versions/87dae5acfd34_.py

+"""empty message
+
+Revision ID: 87dae5acfd34
+Revises: 5ab2fcb61373, 10251d1732a4
+Create Date: 2021-07-20 08:58:26.887779
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '87dae5acfd34'
+down_revision = ('5ab2fcb61373', '10251d1732a4')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass