resolving conflcr
adding vendors