solve Gemfile conflict