typo fix
fix merge