new models
merge the conficts
add layout for articles index