Fix merge derp