resolved problem with dodgy merge