fix dodgy merge