another merge derp