chafe - To be annoyed or lose patience because of rules or limits
Though Ted loved his father (and boss), he chafed under his father's strict supervision, and he was looking forward to the day when his father would retire so he could run the company himself.
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.