about page done
about html merge conflict