merge typos