Definitions of contretemps:

• noun:   an awkward clash

  Example: "He tried to smooth over his contretemps with the policeman"