added favicon.ico
fix conflicts