Fix Merge Wizard Infinite Loop

.. before working on UX and Moxy support