"Reconcile" is a good word.
It means to restore a friendly relationship between 2 people, or 2 things.
"The husband and wife, who had separated for a few months, decided to reconcile."
"I need to reconcile my love for video games with my need for sleep."
"How will those two countries reconcile the conflict?"