Resolve merge conflicts in Gemfile