Fix a patch conflict.