There are two stories involving thirst, and then Moses striking a rock and getting water out of it, and then a confrontation with Esau. In Exodus, they had to fight Amalek, grandson of Esau, at Rephidim, while in Numbers, Jacob negotiated with Esau at Kadesh Barnea, and they turned away from Esau's soldiers.