Fixed typo from merge conflict