makepeace

Short definition from Wiktionary

Noun

1. 1
   A peacemaker; one who reconciles persons at variance with one another; a composer of strife; an adjuster of differences.
2. 2
   A stick, rod or bundle of twigs made from birch wood, used for corporal punishment.

Proper noun

1. 1
   A surname transferred from the nickname.
2. 2
   A male given name transferred from the surname.