edits conflits