fix Gemfile.lock conflict