Merge typo