Changements mineurs
Conflic solved