Fixed typo in solutions
ignoring merge conflict