Fix minor typos and a merging conflict