merge conflict resolution

Assets/Inventory System/Prefabs/Inventory System.prefab

@@ -897,13 +897,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1165938063523323413}
   m_HandleRect: {fileID: 2233503621217788993}
   m_Direction: 0
-<<<<<<< HEAD
-  m_Value: 0.0000009581657
-  m_Size: 0.47786885
-=======
   m_Value: 1
   m_Size: 1
->>>>>>> 2cbb17aa8501dd11e7271aaae21cad3f9fe274af
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -1457,11 +1452,7 @@ MonoBehaviour:
   m_Elasticity: 0.1
   m_Inertia: 0
   m_DecelerationRate: 0.135
-<<<<<<< HEAD
   m_ScrollSensitivity: 75
-=======
-  m_ScrollSensitivity: 10
->>>>>>> 2cbb17aa8501dd11e7271aaae21cad3f9fe274af
   m_Viewport: {fileID: 4086661973484093150}
   m_HorizontalScrollbar: {fileID: 51727583602948897}
   m_VerticalScrollbar: {fileID: 3684466523276116297}
@@ -7743,11 +7734,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 2770326605532365202}
   m_HandleRect: {fileID: 2770326605532365201}
   m_Direction: 0
-<<<<<<< HEAD
-  m_Value: 0
-=======
   m_Value: 1
->>>>>>> 2cbb17aa8501dd11e7271aaae21cad3f9fe274af
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -10708,7 +10695,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 784.583, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 767.58325, y: 762.71313}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2770326606043385264
@@ -11648,6 +11635,7 @@ GameObject:
   - component: {fileID: 2770326606164476907}
   - component: {fileID: 2770326606164476905}
   - component: {fileID: 3305621909771891433}
+  - component: {fileID: 2770326606164476906}
   m_Layer: 5
   m_Name: Loot (Scroll View)
   m_TagString: Untagged
@@ -11714,39 +11702,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-<<<<<<< HEAD
---- !u!114 &2770326606164476906
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2770326606164476903}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Content: {fileID: 2770326604978625765}
-  m_Horizontal: 0
-  m_Vertical: 1
-  m_MovementType: 2
-  m_Elasticity: 0.1
-  m_Inertia: 1
-  m_DecelerationRate: 0.135
-  m_ScrollSensitivity: 75
-  m_Viewport: {fileID: 2770326606707198991}
-  m_HorizontalScrollbar: {fileID: 2770326605669370232}
-  m_VerticalScrollbar: {fileID: 2770326606805154120}
-  m_HorizontalScrollbarVisibility: 0
-  m_VerticalScrollbarVisibility: 0
-  m_HorizontalScrollbarSpacing: -3
-  m_VerticalScrollbarSpacing: -3
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-=======
->>>>>>> 2cbb17aa8501dd11e7271aaae21cad3f9fe274af
 --- !u!114 &2770326606164476905
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -11797,6 +11752,36 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2770326606164476906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2770326606164476903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 2770326604978625765}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 2
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 75
+  m_Viewport: {fileID: 2770326606707198991}
+  m_HorizontalScrollbar: {fileID: 2770326605669370232}
+  m_VerticalScrollbar: {fileID: 2770326606805154120}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2770326606194450798
 GameObject:
   m_ObjectHideFlags: 0
@@ -17401,11 +17386,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 8873855520739210168}
   m_HandleRect: {fileID: 52681282418728116}
   m_Direction: 2
-<<<<<<< HEAD
-  m_Value: 1.0000006
-=======
   m_Value: 1
->>>>>>> 2cbb17aa8501dd11e7271aaae21cad3f9fe274af
   m_Size: 0.6525
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -18951,6 +18932,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: efda854dc0407334a870a7d0db700c6d, type: 3}
+--- !u!224 &7394345909396860500 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3308353764518990372, guid: efda854dc0407334a870a7d0db700c6d,
+    type: 3}
+  m_PrefabInstance: {fileID: 5437072170663378032}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7394345907320378009 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3308353763063672553, guid: efda854dc0407334a870a7d0db700c6d,
@@ -18963,12 +18950,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &7394345909396860500 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3308353764518990372, guid: efda854dc0407334a870a7d0db700c6d,
-    type: 3}
-  m_PrefabInstance: {fileID: 5437072170663378032}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6690270967246225769
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1a642bf0a33311a4c80ac8379cae7684
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5d0cda18af15aae468f87fe0f86fc466
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2943919ce44692d4c95c6d63c910e349
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 02b4de7a2e9e6494f855610cfdc896a6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Test Scene Tony.unity

@@ -56707,11 +56707,6 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -56922,11 +56917,6 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -57097,16 +57087,6 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2770326606043385229, guid: 9f005685dc17f4643b4a1156970fe2f6,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -57172,11 +57152,6 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2770326606164476903, guid: 9f005685dc17f4643b4a1156970fe2f6,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 2770326606255359851, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y