Fix conflicts in active_shipping/base