add Twitter timeline
resolve merge conflict