change Gemfile.lock after merge