merge typo