resolving merge conflict in gemfile