favicon
new manual merge