Fix merge typo