fixed compilation error as a result of bad merge.