Fixing merge typo