speaker: fixed merge derp