fixes

Assets/HDRPDefaultResources/DefaultSceneRoot.prefab.meta

 fileFormatVersion: 2
-guid: 2de98b0dc249886419d437ef55f13829
+guid: ec7d38f95b2996044a594538f1e16917
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset.meta

 fileFormatVersion: 2
-guid: d28bb1c7229120347a106d633870d9c4
+guid: 4b689dc4d56e8d548bdaaa016f261b26
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

ProjectSettings/EditorSettings.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!159 &1
-EditorSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 7
-  m_ExternalVersionControlSupport: Visible Meta Files
-  m_SerializationMode: 2
-  m_LineEndingsForNewScripts: 2
-  m_DefaultBehaviorMode: 0
-  m_SpritePackerMode: 0
-  m_SpritePackerPaddingPower: 1
-  m_EtcTextureCompressorBehavior: 1
-  m_EtcTextureFastCompressor: 1
-  m_EtcTextureNormalCompressor: 2
-  m_EtcTextureBestCompressor: 4
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
-  m_ProjectGenerationRootNamespace: 
-  m_UserGeneratedProjectSuffix: 
-  m_CollabEditorSettings:
-    inProgressEnabled: 1
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!159 &1
+EditorSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_ExternalVersionControlSupport: Visible Meta Files
+  m_SerializationMode: 2
+  m_LineEndingsForNewScripts: 2
+  m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
+  m_SpritePackerMode: 0
+  m_SpritePackerPaddingPower: 1
+  m_EtcTextureCompressorBehavior: 1
+  m_EtcTextureFastCompressor: 1
+  m_EtcTextureNormalCompressor: 2
+  m_EtcTextureBestCompressor: 4
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref
+  m_ProjectGenerationRootNamespace: 
+  m_CollabEditorSettings:
+    inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
+  m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptions: 3
+  m_ShowLightmapResolutionOverlay: 1
+  m_UseLegacyProbeSampleCount: 1
+  m_AssetPipelineMode: 1
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1

ProjectSettings/HDRPProjectSettings.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 61
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 63a2978a97e4fc04cb9d905947216f3d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 1
-  m_DefaultScenePrefabSaved: {fileID: 0}
-  m_DefaultDXRScenePrefabSaved: {fileID: 0}
-  m_ProjectSettingFolderPath: HDRPDefaultResources
-  m_WizardPopupAtStart: 0
-  m_WizardActiveTab: 0
-  m_LastMaterialVersion: 2
+version https://git-lfs.github.com/spec/v1
+<<<<<<< HEAD
+oid sha256:62060f1616d2003038e89f9baa12f33dca7d4d037c609226e438fa5b61622125
+size 608
+=======
+oid sha256:831720e58c2217bf203d3ed92bb70a7f0e21a83e239ec0897c56b5f68a637c01
+size 880
+>>>>>>> a71fdc5... fixes