Fix Gemfile.lock borked by merge by recreating it