manifest
conflit ok 22/05