Fix merge conflict on Gemfile.lock
Fix merge conflict on Gemfile.lock

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