resolve confilect? again