fix conflict phone