Fix Merge

UOP1_Project/Assets/Prefabs/Managers/CutsceneManager.prefab

   m_EditorClassIdentifier: 
   _inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
   _dialogueManager: {fileID: 0}
-  PlayCutsceneEvent: {fileID: 11400000, guid: 9397b637ea93a3a4fb144834511eb199, type: 2}
-  PlayDialogueEvent: {fileID: 11400000, guid: f235c0e2f24681044aa448291b13aaac, type: 2}
-  PauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020, type: 2}
+  _playCutsceneEvent: {fileID: 11400000, guid: 9397b637ea93a3a4fb144834511eb199, type: 2}
+  _playDialogueEvent: {fileID: 11400000, guid: f235c0e2f24681044aa448291b13aaac, type: 2}
+  _pauseTimelineEvent: {fileID: 11400000, guid: 9b0fb5f181adc6b4ca020743fed6c020,
+    type: 2}

UOP1_Project/Assets/Prefabs/Managers/InventoryManager.prefab

   m_Script: {fileID: 11500000, guid: dfa86533a7b7743acbbf3e79c9337aa4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentInventory: {fileID: 11400000, guid: 59c84467f7726dc4587a8373b0936f03, type: 2}
-  CookRecipeEvent: {fileID: 11400000, guid: 1a56201d2b4714889a387c20fbd8f3e8, type: 2}
-  UseItemEvent: {fileID: 11400000, guid: cbe9057614db5422a97c4c250c742f06, type: 2}
-  EquipItemEvent: {fileID: 11400000, guid: 0cef922101fd44b25a2d96f2972d5f50, type: 2}
-  RewardItemEvent: {fileID: 11400000, guid: ceeec59dc461abd4f91dac5b07084d24, type: 2}
-  GiveItemEvent: {fileID: 11400000, guid: c54b320c4205f1c49b296b878daf2097, type: 2}
-  AddItemEvent: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a, type: 2}
-  RemoveItemEvent: {fileID: 11400000, guid: 4ed6ade94b85c452094b0147619e8b49, type: 2}
+  _currentInventory: {fileID: 11400000, guid: 59c84467f7726dc4587a8373b0936f03, type: 2}
+  _cookRecipeEvent: {fileID: 11400000, guid: 1a56201d2b4714889a387c20fbd8f3e8, type: 2}
+  _useItemEvent: {fileID: 11400000, guid: cbe9057614db5422a97c4c250c742f06, type: 2}
+  _equipItemEvent: {fileID: 11400000, guid: 0cef922101fd44b25a2d96f2972d5f50, type: 2}
+  _rewardItemEvent: {fileID: 11400000, guid: ceeec59dc461abd4f91dac5b07084d24, type: 2}
+  _giveItemEvent: {fileID: 11400000, guid: c54b320c4205f1c49b296b878daf2097, type: 2}
+  _addItemEvent: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a, type: 2}
+  _removeItemEvent: {fileID: 11400000, guid: 4ed6ade94b85c452094b0147619e8b49, type: 2}

UOP1_Project/Assets/Prefabs/UI/ButtonChoice.prefab

   m_Script: {fileID: 11500000, guid: b29347f90d2dc4d44a9f055fd9e1bf64, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  choiceText: {fileID: 550526547636381840}
-  MakeAChoiceEvent: {fileID: 11400000, guid: f7b40077957f3834a8d5354c3e4ce759, type: 2}
+  _choiceText: {fileID: 550526547636381840}
+  _makeAChoiceEvent: {fileID: 11400000, guid: f7b40077957f3834a8d5354c3e4ce759, type: 2}
 --- !u!1 &550526546945374985
 GameObject:
   m_ObjectHideFlags: 0

UOP1_Project/Assets/Prefabs/UI/DialoguePanel.prefab

   _lineText: {fileID: 3687453177589032020}
   _actorNameText: {fileID: 3687453177247957428}
   _choicesManager: {fileID: 1284969405}
-  ShowChoicesEvent: {fileID: 11400000, guid: a4e5e48a0f3430c4197b317e650727c6, type: 2}
+  _showChoicesEvent: {fileID: 11400000, guid: a4e5e48a0f3430c4197b317e650727c6, type: 2}
 --- !u!1 &3687453177247957432
 GameObject:
   m_ObjectHideFlags: 0

UOP1_Project/Assets/Prefabs/UI/Inventory Item.prefab

   m_Script: {fileID: 11500000, guid: 4f07228a5666044b5a0f0633262f71f9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemPreviewImage: {fileID: 377764689}
-  itemTitle: {fileID: 2136969677}
-  itemCount: {fileID: 2019030446}
-  bgImage: {fileID: 1045375707}
-  imgHover: {fileID: 5361300499865444271}
-  imgSelected: {fileID: 2650992966786581764}
-  currentItem:
+  _itemPreviewImage: {fileID: 377764689}
+  _itemTitle: {fileID: 2136969677}
+  _itemCount: {fileID: 2019030446}
+  _bgImage: {fileID: 1045375707}
+  _imgHover: {fileID: 5361300499865444271}
+  _imgSelected: {fileID: 2650992966786581764}
+  _currentItem:
-  itemButton: {fileID: 1985079888}
+  _itemButton: {fileID: 1985079888}
 --- !u!1 &7064202503617686431
 GameObject:
   m_ObjectHideFlags: 0

UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs

 	private void DisplayChoices(List<Choice> choices)
 	{
 		_inputReader.advanceDialogueEvent -= OnAdvance;
-
 		if (_makeDialogueChoiceEvent != null)
 		{
 			_makeDialogueChoiceEvent.OnEventRaised += MakeDialogueChoice;
 
 	private void MakeDialogueChoice(Choice choice)
 	{
+	
 		if (_makeDialogueChoiceEvent != null)
 		{
 			_makeDialogueChoiceEvent.OnEventRaised -= MakeDialogueChoice;

UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs

 						{
 							currentItem = _currentInteractableObject.GetComponent<CollectibleItem>().GetItem();
 							_onObjectPickUp.RaiseEvent(currentItem);
-							Debug.Log("PickUp event raised");
 						}
 						//set current interaction for state machine
 						currentInteraction = InteractionType.PickUp;
 					_onCookingStart.RaiseEvent();
 					Debug.Log("Cooking event raised");
 					//Change the action map
-					_inputReader.EnableUIInput();
+					_inputReader.EnableMenuInput();
 					//set current interaction for state machine
 					currentInteraction = InteractionType.Cook;
 				}

UOP1_Project/Assets/Scripts/Inventory/CollectibleItem.cs

 
 	public Item GetItem()
 	{
-		Debug.Log("current item " + _currentItem);
+	
 		return _currentItem;
 
 	}

UOP1_Project/Assets/Scripts/Quests/StepController.cs

 
 	void CheckStepValidity()
 	{
-		if (_checkStepValidityEvent != null)
+			if (_checkStepValidityEvent != null)
 		{
 			_checkStepValidityEvent.RaiseEvent();
 		}

UOP1_Project/Assets/Scenes/TestingGround/Materials.meta

-fileFormatVersion: 2
-guid: 83d0425f34705b243bc0df7534972cdc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: