branch index added..
resolve merging conflict with r2 index and master branch
edit index completed..
resolving conflict in master branch for index branch