fixed typo
fixed typo and merged