refonte profil 2
remove bad controller
merge conflict