Re-work manual merging to all happen in a single shot.