Wal-Mart Expands Pick-Up Service as Grocery War With Amazon Intensifies