fixed typo
merged