Peace on the border, but row over water