just some typos I noticed while scanning the diff
(#511)
merge conflict resolution
(#511)