Cleaned up a dodgy merge/commit