resolving merge conflict
Merge branch 'spice2' of github.com:duckduckgo/zeroclickinfo-spice into spice2