merge_conflict_data_provider.js.es6 7.89 KB