20150511 goa: Two states will find solution to water disputes: Maharashtra CM