collect static + settings site

+ fix merge conflicts
delete db (merge conflict)
remove static_media + update settings site