created about.html
resolved conflict