resoved the conflict problem