Fix a remaining merge conflict.