Fixed merge conflicts someone pushed to repo. >_>