fix conflict
Merge branch 'dev' of https://github.com/Clementp57/eLycee into dev