diff --git a/Viagg-io/Assets/Scenes/LightingSettings/Grotto-Lighting-Settings.lighting.meta b/Viagg-io/Assets/Scenes/LightingSettings/Grotto-Lighting-Settings.lighting.meta
index a4222dd..95981c1 100644
--- a/Viagg-io/Assets/Scenes/LightingSettings/Grotto-Lighting-Settings.lighting.meta
+++ b/Viagg-io/Assets/Scenes/LightingSettings/Grotto-Lighting-Settings.lighting.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: f548dfff2276cb74c80891fa9673888e
+=======
+guid: 02fa99cdf0ebb894fa33bac6c32340e1
+>>>>>>> Stashed changes
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 4890085278179872738