There are conflicts over water. But I think we will see more development of desalination tech as water becomes scarce and people will pay more for water
The real trouble is for agriculture. Even with the current droughts, residential water won't really notice.