resolve merge conflict in Gemfile