fix merge typo