/app/assets/javascripts/merge_conflicts/mixins/
../
line_conflict_actions.js.es6
line_conflict_utils.js.es6