Fix CM merge derp