Making-up

n.
  1. The act of bringing spirits to a certain degree of strength, called proof.
  2. The act of becoming reconciled or friendly.