Merge conflicts
Shell script to fill 2014 timegrid JSON