add link to logo
fix conflict