Resync with interrupting merge.