Conflict Resolution and Prevention in Water Systems