fix conflicts in gemfile