edited more css
fixed merge conflict on index.html
fixed second merge conflict on index.html