add tags to index.html
resolved merge conflict