reconciliation (01/19/18)

reconciliation- agreement after a quarrel

Example: The two decided to put all their arguing behind them and have a reconciliation.