memutils: fix merge derp