From d44bf27550dd8942b813310ec2b4abca79d20186 Mon Sep 17 00:00:00 2001
From: BillWagner <bill.w.wagner@outlook.com>
Date: Wed, 3 May 2017 10:58:23 -0400
Subject: [PATCH] Fix merge issues with rebase.

---
 src/Services/Basket/Basket.API/Controllers/BasketController.cs  | 2 +-
 .../EventHandling/ProductPriceChangedIntegrationEventHandler.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Services/Basket/Basket.API/Controllers/BasketController.cs b/src/Services/Basket/Basket.API/Controllers/BasketController.cs
index 0e64f02ed..906612bce 100644
--- a/src/Services/Basket/Basket.API/Controllers/BasketController.cs
+++ b/src/Services/Basket/Basket.API/Controllers/BasketController.cs
@@ -43,7 +43,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers
         [HttpDelete("{id}")]
         public Task Delete(string id) 
         {
-            return _repository.DeleteBasket(id);
+            return _repository.DeleteBasketAsync(id);
         }
     }
 }
diff --git a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
index a8e87ad4e..9511a2903 100644
--- a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
+++ b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
@@ -33,7 +33,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Even
         {
             var itemsToUpdate = basket?.Items?.Where(x => int.Parse(x.ProductId) == productId).ToList();
 
-            if ((itemsToUpdate != null) && (itemsToUpdate.Any())
+            if ((itemsToUpdate != null) && (itemsToUpdate.Any()))
             {
                 foreach (var item in itemsToUpdate)
                 {