fix build problem introduced by git merge