merge migrations
Merge pull request #276 from mkurek/feature/merge-migrations

merge migrations