added a new spice
fixed merge conflicts