fixed merge win-wavelet-nothread