gemfile conflict removed