Add new spice
Add spice to step 2
Fix merge conflict