The conflict resolution I did on this file seems to have not been real keen. ;) Fixed.