summary, typo fix
fix merge