changes done in district, block model and added pre post monsoon field
conflict removed