merge typo fixes