forgotten conflict now solved in Gemfile.lock