Gemfile.lock conflict fixing