timeline of conflicts