Changed index2.html
fixed merge conflict at header.css