diff --git a/view/sidebar.php b/view/sidebar.php
index 350c8f4..f10d044 100755
--- a/view/sidebar.php
+++ b/view/sidebar.php
@@ -22,7 +22,11 @@ $title = "Breweries";
 $where = "5";
 $what = "brewery";
 
+<<<<<<< HEAD
 $array = listBreweriesNAN($pdo);
+=======
+$array = listBeersByBreweryNAN($pdo);
+>>>>>>> 93e36a779e5f963953576602543f9564d860498b
 
 require("sidebar/sidebarLister.php");