making the spikes appear above the walls
manually resolving merge conflict