Resolve conflict in Gemfile