@XSGeek
Maybe call it out as a topic?
Make it objective.
Because you are both engineers, deconstruct it like a process.

Discuss the way you approach problems and how it might irritate the other person. Ask what you do that irritates them.

Laugh about how wacky we all are.

BTW, I never do this with anyone. :-)
But, I do it with myself. As a consultant I can't create tension with the client, so I swallow my pride and apologize for the other guy.