fixed displaced timeline line
Merge remote branch 'origin/master'