Revert "GEstion de conflit"

This reverts commit 31ac94f9c283a38bc929411bc10ef2f7142c31a5.