Amazon is merging its convenience and grocery store corporate teams