fixed merge bug, migrations bug