--some more stuff
--changed the order of merging data, now database entries are more important than file entries