remove merge typo