Gemfile lock file commit
conflicts
DB changes, apparently