fix export conflict