slove the conflict