resolved conflicts in articles view file