fix conflict
Merge branch 'master' of https://github.com/LGJ-Poitiers/Venthobee.git