merge changes to getFulfillmentLocations