updater prompt re-merge