Cedric Confilct commit