Fixed merge typo.