merge_conflict_data_provider.js.es6 6.06 KB