news model test
merge fix
merge fix 2