gemfile.lock conflict fix