working on about page
fixed conflicts