hypothese 2 v2 et gitignore
merging conflict