finished about page
fixed conflicts