fixed minor merge typo.