diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Distorted musical debuff.prefab.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Distorted musical debuff.prefab.meta
index 9b75b0b26..0718fed28 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Distorted musical debuff.prefab.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Distorted musical debuff.prefab.meta	
@@ -1,2 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
+guid: cbc124570edcbb949b95815174f29fc3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music Tornado.prefab.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music Tornado.prefab.meta
index 9b75b0b26..3cdb4c8b0 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music Tornado.prefab.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music Tornado.prefab.meta	
@@ -1,2 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
+guid: c6cfc5fc22c5d8a41a0e684b6f500432
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music bomb.prefab.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music bomb.prefab.meta
index 9b75b0b26..3d6a19c0c 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music bomb.prefab.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music bomb.prefab.meta	
@@ -1,2 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
+guid: 2aeea34373c65384b8c29c523e1f7d0a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Sounds Hits.prefab.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Sounds Hits.prefab.meta
index 9b75b0b26..5c1dc4e30 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Sounds Hits.prefab.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Sounds Hits.prefab.meta	
@@ -1,2 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
+guid: c843500c9eeb79242b4a02e261b8bdda
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Fire/Litch_FireComet.prefab b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Fire/Litch_FireComet.prefab
index fccfbd482..bdb0482bc 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Fire/Litch_FireComet.prefab	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Fire/Litch_FireComet.prefab	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42983c4e6379aab6a1ede96e88fcf8196887e5caec16b9efc072f7e347f6fe5c
-size 2889385
+oid sha256:d24731f0dc104299c6901d6f06cfa21a5f7c9a110c689ca55e6a8aa272fbdcb5
+size 2889099
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat
index 5863531df..fce6695a4 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat	
@@ -28,7 +28,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -37,8 +37,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NuclearExplosion_Body_Crimson
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -239,6 +238,7 @@ Material:
     - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
     - _diff_c: {r: 0.1541919, g: 0.4053115, b: 0.7264151, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &5159540176204133117
 MonoBehaviour:
   m_ObjectHideFlags: 11
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat.meta
index bd09deaa9..069f87f98 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<<< Updated upstream:Asset Store Build Project/Assets/Piloto Studio/Materials/Blood/Blood
+guid: 8da37a7fa86cfbf4d8b5631d45f2a9b1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat
index b9db6acf4..2f26aaeb7 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat	
@@ -28,7 +28,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -37,8 +37,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: AOEDome_Disco 1
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -372,6 +371,7 @@ Material:
     - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
     - _WhiteColor: {r: 8, g: 0, b: 8, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &3809676810040744887
 MonoBehaviour:
   m_ObjectHideFlags: 11
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat.meta
index 5d9ef6d29..50753403d 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/AOEDome_Disco
+guid: fb965307c8261f94a970b6ee36cec1fd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat
index a6793af2d..ba7c4c29f 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat	
@@ -41,7 +41,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -50,8 +50,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DiscoBase_Desaturated 2
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -228,3 +227,4 @@ Material:
     - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
     - _WhiteColor: {r: 0.2688679, g: 0.94103533, b: 1, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat.meta
index c4d9dd705..c145cdec0 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/DiscoBase_Desaturated
+guid: d03fb883241065b4dad81719ad1b48a9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat
index b90f13b94..03b1845a1 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat	
@@ -37,8 +37,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: HON_Panner
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -238,6 +237,7 @@ Material:
     - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
     - _diff_c: {r: 0.6320754, g: 0.6320754, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &4221895795381840810
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -250,4 +250,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta
index 96d9d5a58..86e6f64cf 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta
+guid: 6d21b68449113754eaf9158dad2f41f8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat
index 962442444..539164619 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat	
@@ -24,8 +24,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Fresnel_Green 1
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -200,6 +199,7 @@ Material:
     - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
     - _WhiteColor: {r: 1, g: 0.5031939, b: 0, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &5035742818894552809
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat.meta
index d1281be3c..5495728b5 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Roguelike/Fresnel_Green
+guid: 4e532bd6a115b954295b7e90117c58bb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat
index f05a6170b..56cfffcba 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat	
@@ -37,8 +37,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Big_Wave_Alpha
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -240,6 +239,7 @@ Material:
     - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
     - _diff_c: {r: 0.1541919, g: 0.4053115, b: 0.7264151, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &4208392637118717686
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -252,4 +252,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat.meta
index 134ba3b6c..ae981e24e 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/MusicalWaves_Trail
+guid: 03f75c62ba9eb5b459f254c41f7fde6f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat
index 5be4e968c..e383faf18 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat	
@@ -25,7 +25,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -34,8 +34,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: WaterBorders_Add
-  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -246,6 +245,7 @@ Material:
     - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
     - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &7517111074570784048
 MonoBehaviour:
   m_ObjectHideFlags: 11
diff --git a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat.meta b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat.meta
index 4951b7a80..3ce45c7b1 100644
--- a/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat.meta	
+++ b/Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat.meta	
@@ -1,2 +1,8 @@
 fileFormatVersion: 2
-<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/Wing_MusicalWaves_Trail
+guid: 26f26bd3ed981324e925695e09ac4d09
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: