About page integration
Conflict removed