rename favicon
merge