reconcile
patch up
make up
conciliate
settle
come to terms
After some discussion we finally made up