add about page
merge