Timeline movement now updates the list of conflicts