Timeline now displays conflicts