Fix merge conflict mistake.