fixing merge derp