resolve conlfict