Fixed header table done
Conflict resolved index.html