Fix merge derp #3