changed favicon
fixed merge