PM: fix one more merge derp