Fix merge derp #2