Fixed a typo from a merge conflict.