Fixing typo.
Fixing merge conflict.