change type of news tabel
merge conflict