fixing abt page
fixing abt page
trying to resolve conflict