Fixed another obvious merge error. What's wrong with me?