just in case before pull
trying to fix merge conflicts in html
still fixing html merge conflict
fixed index.html merge conflicts
commiting anything I forgot before pull