Southern states raise water disputes, delimitation concerns with Amit Shah