Alas, if git itself could not resolve the conflict, then definitely make it automatically impossible.
To take only the required changes, you can, if you simply copy a tree v2 on top of the wood master, and then record only the changes with
git add --interactive. Still unnecessary then removed via
git checkout ., which will reset the working directory to the index (all that was added using
git add, left).