fixing compilation error due to git merge