Resolve conflicts

assets/js/blocks/product-collection/edit/inspector-controls/layout-options-control.tsx

@@ -19,7 +19,7 @@ import {
 /**
  * Internal dependencies
  */
-import { DisplayLayoutControlProps, LayoutOptions } from '../types';
+import { DisplayLayoutControlProps, LayoutOptions } from '../../types';
 
 const getHelpText = ( layoutOptions: LayoutOptions ) => {
 	switch ( layoutOptions ) {

assets/js/blocks/product-collection/edit/toolbar-controls/index.tsx

@@ -9,15 +9,14 @@ import { BlockControls } from '@wordpress/block-editor';
  */
 import { setQueryAttribute } from '../../utils';
 import DisplaySettingsToolbar from './display-settings-toolbar';
-import DisplayLayoutToolbar from './display-layout-toolbar';
 import PatternChooserToolbar from './pattern-chooser-toolbar';
 import type { ProductCollectionEditComponentProps } from '../../types';
 
 export default function ToolbarControls(
 	props: ProductCollectionEditComponentProps
 ) {
-	const { attributes, setAttributes, openPatternSelectionModal } = props;
-	const { query, displayLayout } = attributes;
+	const { attributes, openPatternSelectionModal } = props;
+	const { query } = attributes;
 
 	const setQueryAttributeBind = useMemo(
 		() => setQueryAttribute.bind( null, props ),
@@ -35,10 +34,6 @@ export default function ToolbarControls(
 						query={ query }
 						setQueryAttribute={ setQueryAttributeBind }
 					/>
-					<DisplayLayoutToolbar
-						displayLayout={ displayLayout }
-						setAttributes={ setAttributes }
-					/>
 				</>
 			) }
 		</BlockControls>

assets/js/blocks/product-collection/types.ts

@@ -75,7 +75,7 @@ export type TProductCollectionOrderBy =
 	| 'popularity'
 	| 'rating';
 
-export type DisplayLayoutToolbarProps = {
+export type DisplayLayoutControlProps = {
 	displayLayout: ProductCollectionDisplayLayout;
 	setAttributes: ( attrs: Partial< ProductCollectionAttributes > ) => void;
 };