A Chronology of Conflict and Resolution, 1945-1985