Fixed a dodgy merge.