reconciliation
🇺🇸
/ˌrekənsɪliˈeɪʃn/
🇬🇧
/ˌrekənsɪliˈeɪʃn/
ending a fight and becoming friends again
After their argument, they worked on reconciliation to restore their friendship.
making different ideas work together without conflict
Finding reconciliation between new technology and old traditions is important.