fixing dodgy merge