Fixed merge dialog