I posted before seeing your post #8. Good that you are getting things smoothed out. Fake apologies provide a great deal of social lubrication. They prove valuable in calming down situations where it's just not worth having continued turmoil. Some of the most powerful people in the world are the quickest at issuing "fake apologies."

Being "less upfront about things during conflict" might serve you very well. I learned that lesson myself, after I got tired of what it was costing me to go around getting in people's faces with my treasured honesty. There is a lot of power in diplomacy. It takes practice to learn the art of it, but no one was ever "really upset" over being too diplomatic. Learn to "choose your fights" and "pick your battles." And never lay all your cards on the table . . . or do it very seldom. The only person who really needs to know what cards you are holding is you.