Resolve #92: favicon
Resolve conflicts