typos found with vim
fix some more minor typos in remote section
merge conflict fixed.