updated changes for merging entity Supplier -Fuyao