Fix merge conflict
Fix merge conflict

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