fixed typos from merge