fix little conflict problem