resolve confilect