resolve merge conflicts
Remove gem versions from Gemfile