fixed conflicts with migrations and bundler