Fixed typo from conflict resolution earlier