spinlock: fix merge derp