delete local gemfile.lock
merge