Updating: preparing for merge.
Updating: manually merging.