solve the conflict when pull