fixed spelling
fixed merge conflict