Fix minor typos and a merging conflict

Many thanks for reviewing.