I mind ninja people ...which means I confuse people until they think I'm right or thank me for being wrong . No more conflict :) or when that doesn't work I pout :/
When I was younger physical fights, little older nice/nasty words and attitude, now I'm older I speak my mind and leave.
I've got no time for foolishness.
As Rooster said, it depends on the type of conflict. I've found humour will take the sting out of most situations ... IF it's done the right way.
Guess it really depends on the type of conflict to me. Some are easy to deal with and some, like ex-wives is a whole different story.