Fix Merge

UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab

   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &765271293
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3351096123413661336}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b803c85ebca51c4499674adbe5ea4a21, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _actor: {fileID: 11400000, guid: 027d026cf519df04eb8b7bf251472e13, type: 2}
+  _defaultDialogue: {fileID: 11400000, guid: f7ead55387bac6d4a9ba9bf10c5c3ee5, type: 2}
+  _questAnchor: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
+  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
+  _winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
+  _loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
+  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
+    type: 2}
 --- !u!1001 &2428999546476283589
 PrefabInstance:
   m_ObjectHideFlags: 0
     - target: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0
+      value: -0.07981562
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
         type: 3}
     - target: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: -0.94277906
-      value: 1
+      value: 0.51410294
-      value: 0
+      value: -0
-      value: -0
+      value: -0.85772854
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
         type: 3}
     - target: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: -118.12501
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
         type: 3}

UOP1_Project/Assets/Scenes/Whiteboxing/GeneralMapReduced/Materials/WhiteboxingReduced.mat

   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: WhiteboxindReduced
+  m_Name: WhiteboxingReduced
   m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62,
     type: 3}
   m_ShaderKeywords: 

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DropRewardSO.cs

 			postion + itemPrefab.transform.localPosition +
 			_dropRewardConfig.ScatteringDistance * (Mathf.Cos(randAngle) * Vector3.forward + Mathf.Sin(randAngle) * Vector3.right),
 			Quaternion.identity);
-		collectibleItem.GetComponent<CollectibleItem>().CurrentItem = item;
+		collectibleItem.GetComponent<CollectibleItem>().SetItem ( item);
 	}
 }

UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs

 			case InteractionType.Talk:
 				if (_startTalking != null)
 				{
-					//TODO:
-					//Actor currentActor = currentInteractableObject.GetComponent<Dialogue>().GetActor();
-					//_startTalking.RaiseEvent(currentActor);
-					_currentInteractableObject.GetComponent<StepController>().InteractWithCharacter();
+					_potentialInteractions.First.Value.interactableObject.GetComponent<StepController>().InteractWithCharacter();
 					_inputReader.EnableDialogueInput();
 				}
 				break;