Merge Issues Part1

Assets/Scenes/Lilia.unity

@@ -621,10 +621,10 @@ GameObject:
   - component: {fileID: 1174591347}
   - component: {fileID: 1174591346}
   - component: {fileID: 1174591345}
-<<<<<<< HEAD
-=======
+
+
   - component: {fileID: 1174591349}
->>>>>>> 05d0638ebe41a5b1fc8b29e6c4cc410bb0d97892
+
   - component: {fileID: 1174591348}
   m_Layer: 0
   m_Name: Main Camera
@@ -716,8 +716,8 @@ MonoBehaviour:
   m_GameObject: {fileID: 1174591344}
   m_Enabled: 1
   m_EditorHideFlags: 0
-<<<<<<< HEAD
-=======
+
+
   m_Script: {fileID: 11500000, guid: 49abaa4b8268a754399fa82119a91c67, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::CameraLook
@@ -733,7 +733,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1174591344}
   m_Enabled: 1
   m_EditorHideFlags: 0
->>>>>>> 05d0638ebe41a5b1fc8b29e6c4cc410bb0d97892
+
   m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
@@ -769,8 +769,7 @@ MonoBehaviour:
     m_VarianceClampScale: 0.9
     m_ContrastAdaptiveSharpening: 0
   m_Version: 2
-<<<<<<< HEAD
-=======
+
 --- !u!1 &1639874320
 GameObject:
   m_ObjectHideFlags: 0
@@ -2445,7 +2444,7 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
->>>>>>> 05d0638ebe41a5b1fc8b29e6c4cc410bb0d97892
+
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0