Make a working copy.
Resolve merge conflict