fixing Gemfile merge conflict