Conflict (Chinese: 奮鬥) is a TVB television series, premiered on October 2, 1978. Theme song "Conflict" was composed and arranged by Joseph Koo, lyricised by Wong Jim, and sung by Jenny Tseng.

An edit conflict is a computer problem where multiple editors cannot all edit the same item during a short time period. The problem is encountered on wikis or distributed data systems. An edit conflict occurs when a shared document is being edited by more than one person at the same time, and the attempted changes are treated as incompatible with each other. One person attempts to edit the document, but upon trying to save the new version, another person has already modified the document in the intervening time period, thus causing a difference between the attempted edit and the already-made edit that must be resolved manually, and causing an "edit conflict" error message. According to computer writer Gary B. Shelly, "Many wikis will block the contributor who is attempting to edit the page from being able to do so until the contributor currently editing the page saves changes or remains idle on the page for an extended period of time."

The problem is common when working on heavily edited articles on Wikipedia, such as those about a "current event" or a "person suddenly in the news", or on other "high-traffic pages".

Conflict refers to some form of friction, disagreement, or discord arising within a group when the beliefs or actions of one or more members of the group are either resisted by or unacceptable to one or more members of another group. Conflict can arise between members of the same group, known as intragroup conflict, or it can occur between members of two or more groups, and involve violence, interpersonal discord, and psychological tension, known as intergroup conflict. Conflict in groups often follows a specific course. Routine group interaction is first disrupted by an initial conflict, often caused by differences of opinion, disagreements between members, or scarcity of resources. At this point, the group is no longer united, and may split into coalitions. This period of conflict escalation in some cases gives way to a conflict resolution stage, after which the group can eventually return to routine group interaction once again.

Definitions

M. Afzalur Rakhim notes there is no single universally accepted definition of conflict. He notes that one issue of contention is whether the conflict is a situation or a type of behavior.