Create article model
Merge conflict