merge_conflict_resolver.js.es6 1.12 KB