fixed typo
fixed merge conflicts