typo
fix merge