After finalizing index page
resolved merge conflict
Merge branch 'r2_contacts'