mixpanel: resolve conflict
mixpanel: resolve conflict

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