solove the conflict