deleted header stuff that i missed from last merge conflict resolution
compiled dist and fixed some merge issues in index.html