added article form that doesnt work
fixed merge conflict