Fix compile error after merge.
1 file changed