Modification tutoriel
Resolved conflict