fixed merge typo