20170305 city.jammu: J&K and Punjab sort out Shahpur Kandi dam row