Remove merge derp