Rename ConflictResolution.IGNORE
-> ADD
#6686
Merged
ConflictResolution.IGNORE
-> ADD
#6686