I'm a numpty and I didn't check my merge