Vendors appear to work.
conflict resolved
conflict resolved
fixed a typo