De-duplicate conflicts for mysql and friends