Merge conflict fix for redis cache exception handling

tests/cartservice/CartServiceTests.cs

@@ -31,6 +31,7 @@ namespace cartservice
             };
             var cart = await client.GetCartAsync(request);
             Assert.NotNull(cart);
+            
             // All grpc objects implement IEquitable, so we can compare equality with by-value semantics
             Assert.Equal(new Cart(), cart);
         }