This is a patch for 1.3.6, 1.3.7 has the new repl conflict code and the issue doesn't exist there.
https://pagure.io/389-ds-base/issue/49431 https://pagure.io/389-ds-base/issue/raw/files/20a14477469be8ef77d92d1023456c...
389-devel@lists.fedoraproject.org