fix gemfile conflict