Apparently just a merge conflict. Please change it back (I'm not able to until next Tuesday).