Click 4. gestion des conflits.pdf link to view the file.