fixed typo
Fixing merge