add favicon
merge