diff --git a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
index 6f11200..210fbd8 100644
--- a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
+++ b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
@@ -75,7 +75,7 @@
             items.add("砂糖");
 
             ArrayAdapter<String> adapter = new ArrayAdapter<String>(getContext(), R.layout.item_list, items);
-            itemList.setAdapter(adapter);
+            //itemList.setAdapter(adapter);
         }
 
 
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index a165241..e3df2b7 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -23,18 +23,10 @@
         android:padding="15dp"
         android:gravity="left"
         />
-<<<<<<< Updated upstream
 
     <ListView
         android:id="@id/listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-=======
-    <ListView
-        android:id="@id/listview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        />
->>>>>>> Stashed changes
 </LinearLayout>
\ No newline at end of file