Student or Learner
Suppose "a" have a fight with "b" at work. The atmosphere gets a little bit heavy and they stop talking to each other for a while.
After a few weeks, the the mood gets better and they decide to start talking again.
Is there a popular idiom for the act of "forgetting the anger and the fight and resuming talking to each other again"?
"bury the hatchet"
"call a truce"
"forgive and forget"
"kiss and make up"