fix conflict case crash