📒 an end to a disagreement or conflict with somebody and the start of a good relationship again
📒 the process of making it possible for two different ideas, facts, etc. to exist together without being opposed to each other