Got rid of a sneaky merge conflict that I missed!