minor typos
merged conflicts