conflicted edits