Comportements
Commit modif + resolve conflicts