Conflict

Source: Wikipedia, the free encyclopedia.

Conflict may refer to:

Social sciences

Military

Arts, entertainment, and media

Engineering

  • Conflict (air traffic control)
    , a loss of separation between two aircraft
  • Conflict (revision control)
    , a computer problem wherein multiple editors attempt to edit the same document

As a proper noun

Military

Arts, entertainment, and media

Films

Games

Literature and periodicals

Music

Television

See also