add new lines in index
resolve merge conflicts
completed coding
Merge branch 'r2_index'