fixed typo
merge