diff --git a/inventory/views.py b/inventory/views.py
index faa94f9b..8145835c 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -790,7 +790,6 @@ class CustomerUpdateView(LoginRequiredMixin, UpdateView):
 def delete_customer(request, pk):
     customer = get_object_or_404(models.Customer, pk=pk)
     customer.delete()
-<<<<<<< HEAD
     messages.success(request, _('Customer deleted successfully.'))
     return redirect('customer_list')
 
@@ -848,7 +847,3 @@ def delete_vendor(request, pk):
 
 
 
-=======
-    messages.success(request, _("Customer deleted successfully."))
-    return redirect("customer_list")
->>>>>>> c96865f (add search to select fields, redirect logged in user to landingpage if they are authenticated)