fixed merge
fixed merge

dbirchak/cartodb,DigitalCoder/cartodb,future-analytics/cartodb,nyimbi/cartodb,raquel-ucl/cartodb,codeandtheory/cartodb,nuxcode/cartodb,nuxcode/cartodb,codeandtheory/cartodb,future-analytics/cartodb,DigitalCoder/cartodb,DigitalCoder/cartodb,future-analytics/cartodb,raquel-ucl/cartodb,future-analytics/cartodb,thorncp/cartodb,thorncp/cartodb,UCL-ShippingGroup/cartodb-1,splashblot/dronedb,thorncp/cartodb,raquel-ucl/cartodb,dbirchak/cartodb,codeandtheory/cartodb,CartoDB/cartodb,bloomberg/cartodb,UCL-ShippingGroup/cartodb-1,CartoDB/cartodb,DigitalCoder/cartodb,dbirchak/cartodb,dbirchak/cartodb,codeandtheory/cartodb,thorncp/cartodb,CartoDB/cartodb,splashblot/dronedb,nuxcode/cartodb,bloomberg/cartodb,bloomberg/cartodb,thorncp/cartodb,future-analytics/cartodb,bloomberg/cartodb,raquel-ucl/cartodb,CartoDB/cartodb,dbirchak/cartodb,splashblot/dronedb,nuxcode/cartodb,UCL-ShippingGroup/cartodb-1,nyimbi/cartodb,UCL-ShippingGroup/cartodb-1,DigitalCoder/cartodb,bloomberg/cartodb,CartoDB/cartodb,raquel-ucl/cartodb,splashblot/dronedb,nyimbi/cartodb,UCL-ShippingGroup/cartodb-1,nuxcode/cartodb,splashblot/dronedb,codeandtheory/cartodb,nyimbi/cartodb,nyimbi/cartodb