Fixing an issue with 409 when trying to re-replicate a conflict