Peacemaking
We were both conflict avoiders, and neither of us was actually peacemaking. The peacemaker the Savior promised would be called a child of God is not the person whose conversations are smooth. The peacemaker is the person whose heart is no longer at war.