after merge update