Revert "Nouveau test de conflit de commits"

This reverts commit 30c56bafef83d25ec895a52fbece124b27a6cf35.