@@ -0,0 +1,573 @@
+%22%22%22merge job_err with add_fsrs%0A%0ARevision ID: d998c46bacd9%0ARevises: 361fbffcf08b, caa6895e7450%0ACreate Date: 2016-08-26 19:09:39.554574%0A%0A%22%22%22%0A%0A# revision identifiers, used by Alembic.%0Arevision = 'd998c46bacd9'%0Adown_revision = ('361fbffcf08b', 'caa6895e7450')%0Abranch_labels = None%0Adepends_on = None%0A%0Afrom alembic import op%0Aimport sqlalchemy as sa%0A%0A%0Adef upgrade(engine_name):%0A    globals()%5B%22upgrade_%25s%22 %25 engine_name%5D()%0A%0A%0Adef downgrade(engine_name):%0A    globals()%5B%22downgrade_%25s%22 %25 engine_name%5D()%0A%0A%0A%0A%0A%0Adef upgrade_data_broker():%0A    pass%0A%0A%0Adef downgrade_data_broker():%0A    pass%0A%0A

Add merge migration to resolve alembic conflict