Update in competence/salaire
Merge conflict fixed