remove conflict string