modificatins tiers from prod
fix conflict
maj bdd
deleting useless files before merge
maj ghost
fix majs