3D VortexConf fixed
merge conflict