created article model, modified article and category models
fixed conflicts