power: fix merge derp