fix a merge error and compile on msvc