Fix Gemfile.lock conflict