To make up / To reconcile
Used when two people resolve a conflict and restore their relationship. Can be used between friends, family, or colleagues.
After the argument, they made up.
—Are you still angry with her? —No, we've already made up.
It's time to make up and move on.