resolve confilic