Fix conflicts
Fix conflicts
Add npm version
Add npm version
remove favicon
remove favicon
Tweak style