remove redundent
fix merge