resolution, panneau de config
Conflic solved
Conflict solved