Words: reconcile patch up make up conciliate settle
Part of speech: v
Definition: come to terms
Example: After some discussion we finally made up