Resolution over Cauvery Water dispute