fixed up dodgy merge