The Collaborative International Dictionary of English v.0.48:

Conflict \Con*flict"\, v. i. [imp. & p. p. Conflicted; p. pr.
   & vb. n. Conflicting.] [L. conflictus, p. p. of confligere
   to conflict (cf. conflictare); con- + fligere to strike; cf.
   Gr. fli`bein, qli`bein, to press, L. flagrum whip.]
   1. To strike or dash together; to meet in violent collision;
      to collide. --Shak.
      [1913 Webster]

            Fire and water conflicting together.  --Bacon.
      [1913 Webster]

   2. To maintain a conflict; to contend; to engage in strife or
      opposition; to struggle.
      [1913 Webster]

            A man would be content to . . . conflict with great
            difficulties, in hopes of a mighty reward. --Abp.
                                                  Tillotson.
      [1913 Webster]

   3. To be in opposition; to be contradictory.
      [1913 Webster]

            The laws of the United States and of the individual
            States may, in some cases, conflict with each other.
                                                  --Wheaton.

   Syn: To fight; contend; contest; resist; struggle; combat;
        strive; battle.
        [1913 Webster]

The Collaborative International Dictionary of English v.0.48:

Conflicting \Con*flict"ing\, a.
   1. Being in conflict or collision, or in opposition;
      contending; contradictory; incompatible; contrary;
      opposing; marked by discord.

   Syn: antagonistic, at odds(predicate), clashing.
        [1913 Webster + WordNet 1.5]

              Torn with sundry conflicting passions. --Bp. Hurd.
        [1913 Webster]

   2. in disagreement; -- of facts or theories.

   Syn: at odds(predicate), contradictory, self-contradictory.
        [WordNet 1.5]

WordNet (r) 3.0 (2006):

conflicting
    adj 1: in disagreement; "the figures are at odds with our
           findings"; "contradictory attributes of unjust justice
           and loving vindictiveness"- John Morley [syn: at
           odds(p), conflicting, contradictory, self-
           contradictory]
    2: on bad terms; "they were usually at odds over politics";
       "conflicting opinions"