Studying conflict in society – medieval to modern