etape 6 debut
conflict solving