Add/edit about us
fix merge