20140302 city.goa: Trader-vendor row at Margao market resolved