The simmering feud between panchayati raj minister Mani Shankar Aiyar and rural development minister Raghuvansh Prasad Singh is likely to spurt to life with the PMO removing National Water Mission