Fix a silent merge error.