Fixed compilation error due to merge error.