dodgy merge