Title: Analysing Conflict and its Resolution