Didn't save Gemfile.lock on merge commit