cedric modif
conflit resolu