WIP: started mergeTool walkthrough