Fix merge fail.
Fix build.