Fix conflicts in gemfile