add fav
remove old favicon
merge