Fix merge error
Fix merge error

perobertson/shipit-engine,ershad/shipit-engine,perobertson/shipit-engine,perobertson/shipit-engine,perobertson/shipit-engine,ershad/shipit-engine,Shopify/shipit-engine,perobertson/shipit-engine,Shopify/shipit-engine,ershad/shipit-engine,Shopify/shipit-engine,Shopify/shipit-engine,Shopify/shipit-engine,ershad/shipit-engine,ershad/shipit-engine