updated timeline merge