remove conflict