/app/assets/javascripts/merge_conflicts/