Fix compile error caused by merge error.