added about us
fixing merge