Fix merge conflict

Assets/Prefabs/UI/InventoryUI.prefab

@@ -11368,8 +11368,8 @@ GameObject:
   m_Component:
   - component: {fileID: 6778274724352405780}
   - component: {fileID: 5765354275366674162}
-  - component: {fileID: 6707240765686952970}
-  - component: {fileID: 2036361547023377128}
+  - component: {fileID: 7531521852624317281}
+  - component: {fileID: 7402631882746451531}
   m_Layer: 5
   m_Name: character_preview
   m_TagString: Untagged
@@ -11388,7 +11388,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3052795108239739127}
   m_Father: {fileID: 3289674559629147232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -11404,7 +11405,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5468137454250289500}
   m_CullTransparentMesh: 1
---- !u!114 &6707240765686952970
+--- !u!114 &7531521852624317281
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11413,7 +11414,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5468137454250289500}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -11424,14 +11425,17 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 42c3c43cd0c3b704cb6cf0dd1051d9ff, type: 2}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!114 &2036361547023377128
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7402631882746451531
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11440,30 +11444,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5468137454250289500}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 693e85b6242cc8f4ea4c161aa42dfb1f, type: 3}
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  hostPlayer: {fileID: 0}
-  autoBindHostPlayer: 1
-  sourceModelRoot: {fileID: 0}
-  cloneWholeHostHierarchy: 1
-  stripRuntimeComponents: 1
-  previewRoot: {fileID: 6778274724352405780}
-  previewLocalPosition: {x: 0, y: 0, z: 100}
-  previewLocalEuler: {x: 0, y: 0, z: 0}
-  previewLocalScale: {x: 1, y: 1, z: 1}
-  previewFrame: {fileID: 6707240765686952970}
-  previewRenderTexture: {fileID: 8400000, guid: 42c3c43cd0c3b704cb6cf0dd1051d9ff, type: 2}
-  autoFocusCamera: 1
-  cameraFocusOffset: {x: 0, y: 0, z: 0}
-  previewCameraDistance: 3.3
-  previewCameraOffset: {x: 0.06, y: 1.07, z: 0}
-  overrideFieldOfView: 1
-  previewFieldOfView: 44
-  autoFrameByBounds: 1
-  autoFramePadding: 1.15
-  minAutoCameraDistance: 1.25
-  maxAutoCameraDistance: 8
+  m_ShowMaskGraphic: 0
 --- !u!1 &5473020210238587200
 GameObject:
   m_ObjectHideFlags: 0
@@ -17607,6 +17591,78 @@ MonoBehaviour:
   m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7898642711851878611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3052795108239739127}
+  - component: {fileID: 9178171791072353269}
+  - component: {fileID: 7628333317866785984}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3052795108239739127
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898642711851878611}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.65, y: 0.65, z: 0.65}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6778274724352405780}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1024, y: 1024}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9178171791072353269
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898642711851878611}
+  m_CullTransparentMesh: 1
+--- !u!114 &7628333317866785984
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898642711851878611}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 8400000, guid: 7b35d3c1ebbb32d47a5ed61606928730, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &7922220820718314155
 GameObject:
   m_ObjectHideFlags: 0