Clean db, user file
Merge