merge_conflicts_data.coffee 2.4 KB