Preparing for a merge
Updating: merging is done