add news. temp commit
create settings migration
merge and fix conflict in setting model