Add ability to treat update conflicts as non transient