Merged conflicts
Trying to merge
Merge branch 'master' of git@github.com:barchart/barchart-feed-ddf.git