I was never really scared about fighting with him. A bit frustrated that we had to argue so much, at one point, over the same 1-2 issues? Sure.
I got over that when I realized that I had to choose my battles. That not everything warrants being made a big deal and that sometimes, it's best to swallow my pride and jut put up with it than be overly nitpicky.