refacto
invitation duel
Resolve conflit
resolve conflit
resolve conflit
merge