moved articles into place
fixing an merge conflict