FEATURE added merge dialog (WIP - not active)