stop conflicting my edits