[JobCard] Corrections coquilles
Resolution conflit