sql back to initial modifications
Merging of modified files
for merging purposes
merging modified files
normalized the database and modified the corresponding files
to be able to push modified files