Conflicted update