Conflicts: dist/vis.css dist/vis.js dist/vis.min.css dist/vis.min.js src/DataSet.js src/timeline/Timeline.js