Fixed merge typo