fixed merge error

fixed merge error