Select menu style
Merge branch 'master' of github.com:kitx/water-costarica
Select menu on right
resolve merge conflict