fix a build problem
merge