Merge "RCFilters: Add conflicts for minor edits"