update favicon
fix merge conflict