GitHub repository: Agoutitou/workshop_2
Description: Gestion de Merge Conflit