integration et correction entities
integration et correction entities
resolve conflict