use mergepbx, follow large rename on diff, etc.