real solve conflicts with categories

products/views.py

@@ -183,13 +183,6 @@ def product_search(request):
             products_qs = Product.objects.filter(active=True)
             # filter by category
             if categories is not None:
-<<<<<<< HEAD
-                query = Q()
-                for entry in categories:
-                    query = query | Q(category__name__contains=entry)
-                products_qs = products_qs.filter(query)
-
-=======
                 descendants = []
                 for entry in categories:
                     cat = CategoryTag.objects.filter(label__iexact=entry).first()
@@ -198,7 +191,6 @@ def product_search(request):
                     descendants.extend(cat.children.all())
 
                 products_qs = products_qs.filter(category__in=descendants)
->>>>>>> development
             # filter by tags
             if tags is not None:
                 products_qs = products_qs.filter(tags__name__icontains=tags)