remove conflict version