Definition of "Contretemps" :

noun: an awkward clash

"He tried to smooth over his contretemps with the policeman."