Recently read an article which said that people in happy marriages don't have less arguments than less-happy couples, they just tend to resolve them better-- usually with humor.
I think this holds true for good friendships too.
At the Brandenburg Gate, N. didn't like the picture I took of him.
So he took this picture of me:
I got the message.
Our final pictures made everyone happy.