fixed merge to handle "synonym groups"; added merge confirm dialog