Update Gemfile.lock
remove conflict