fixed reissue conflict