favicon
merge & conflick