removed old migrations
fixed conflict