merge typo?