A History of Conflict