added p
resolve merge confilct
added note v2
Merge branch 'r2_index'