language typos from merge