added display all vendors page
fixed merge conflict