Fix up the merge conflict.