conflict resolved
updatin locations and categories in trade sphere
conflict resolved