Fix a small merge derp