diff --git a/Assets/Models/Materials/fa.mat b/Assets/Models/Materials/fa.mat
index 713a640..575dd52 100644
--- a/Assets/Models/Materials/fa.mat
+++ b/Assets/Models/Materials/fa.mat
@@ -82,7 +82,11 @@ Material:
     - _EmissionEnabled: 0
     - _FlipbookMode: 0
     - _GlossMapScale: 1
+<<<<<<< HEAD
     - _Glossiness: 0.267
+=======
+    - _Glossiness: 0.026
+>>>>>>> ca51b2b3d02d5199d54e36a1db68520359753a99
     - _GlossyReflections: 1
     - _LightingEnabled: 1
     - _Metallic: 0
@@ -99,7 +103,11 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
+<<<<<<< HEAD
     - _Color: {r: 1, g: 1, b: 1, a: 0.94509804}
+=======
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+>>>>>>> ca51b2b3d02d5199d54e36a1db68520359753a99
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []