Updated Merge Tool Part 2c (last part)

.. UX to adjust now complete.

We may need to tidy a few things up, but this
is now good for working with the Moxy at the
very least.