Changing OMZsh update from a rebase to a merge.