Gah, Merge tool fucked up.