about page
merge fix