fixing merge typo