petite refonte
fix conflict