Ajout des situations
merging fail
merged done :)