resolve confilcts