diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index f5e49bc..dd4a3ba 100644
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -112,11 +112,7 @@ class PaypalController extends Controller {
 		// $order_subtotal = 	$updated_getSubtotal[0]->Subtotal;
 		$order_grandtotal = $updated_getSubtotal[0]->Subtotal;
 		
-<<<<<<< HEAD
-		if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131){
-=======
-		if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 30){
->>>>>>> 67b52fcc1aeb55e7b1295821039a38ffeca5de18
+		if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30){
 			$tax_value = 0;
 		}else{
 			$tax_value = 0.10;