removed typos from merge