improved about page
conflict