GoM set up on Haryana water row