fixed the timeline
fixed merge conflict
ok, now i fixed it
merge?