clean entities 2
generates entities 3
merge de la bdd