Update progress.
Resolve the merge.