Fix merge errors.
Fix merge error.