resolve conflix