merge dialog nearly merges, looks pretty