about page
about and fix
fix merging