Biblical Advice For Defusing Tension [Vayishlach]

Yaakov was first terrified to meet Esav. But Esav had a change of heart. What did yaakov do to inspire this temporary change? What can we learn in diffusing tense relationships?