Fixing typo in variable name.
Resolve conflict.