typo fixes
resolve merge conflict