add About Page
fix merge