Fixed typo found by Asher
ignoring merge conflicts