Update the working version.
Resolve merge conflict.