modified vendor and market controllers
agreement on merge