cleaned settings, fixed many things which I cannot remember, but EVERYTHING WORKS
merge conflicts resolved, nothing important