Merge conflict

Author: davidsklar99

packages/ui-components/src/postgrest-infinite-scroll.ts

@@ -67,7 +67,6 @@ export function PostgRESTInfiniteScrollView(
   const SearchBarToUse = SearchBarComponent ?? SearchBar;
   const MultiSelectToUse = MultiSelectComponent ?? MultiSelect;
 
-<<<<<<< HEAD
   const orderOperator = ascending ? `asc` : `desc`;
   const notOrderOperator1 = ascending ? `desc` : `asc`;
   const compOperator = ascending ? `gt` : `lt`;
@@ -84,17 +83,6 @@ export function PostgRESTInfiniteScrollView(
       ? 0
       : 2 ** 28;
 
-=======
-  const res = useAPIResult(route, { limit: 1 });
-  const [selectedItems, setSelectedItems] = useState<string[]>(
-    searchColumns || [],
-  );
-  const [filterValue, setFilterValue] = useState<string>("");
-  const operator1 = ascending ? `asc` : `desc`;
-  const notOperator1 = ascending ? `desc` : `asc`;
-  const operator2 = ascending ? `gt` : `lt`;
-  const notOperator2 = ascending ? `lt` : `gt`;
->>>>>>> cbeb803c45afa609f8dcaa75bbdde83b2d0694f3
   const id = ascending ? 0 : maxId;
   const notId = ascending ? maxId : 0;
   const newInitialItems =