Didn't notice that one of the names was miss spelled after fixing the merge conflicts