Removing bad code after a dodgy merge