[#56185984] Add timeline
Fix merge conflict
Update javascript