After finalizing index page
resolved merge conflict