Meaning of contretemps

(noun) an awkward clash; "he tried to smooth over his contretemps with the policeman"