Mergetool will now prompt. More control.
Attempting to swap to splice again for merges.