Avoid conflict files with an Editing Badge