[ci skip] format l'affichage de la notif badge - TO TEST
fix merge bug
merge conflict
Merge branch 'master' of github.com:matttbe/SIT