reconcile - To bring two or more people or groups into a state of harmony or understanding after a disagreement or conflict.
After a long argument, they managed to reconcile their differences and rebuild their relationship, realizing how much they valued each other.
tinker - To attempt to repair or improve something in a casual way, often to no useful effect
Mitch tried to tinker with his computer before realizing that it was more broken that he had thought, and that he had to bring it to the computer store to have a professional repair it.