Fixed manifest after dodgy merge