Added spikes knockback
Merge