fixed mobile timeline
merge conflict