remove conflict method