Revert "Induce conflicts on renard_et_bouc"

This reverts commit 3aeab6d48ce7568c18b168d2db8c5cece9a43e81.