Typo for enumerations changed.
Merge conflict fixed.