fix conflict in gemfile