diff --git a/.gitignore b/.gitignore
index c896beb..4f63514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ Plugins/**/Intermediate/*
 # Cache files for the editor to use
 DerivedDataCache/*
 
+<<<<<<< HEAD
 SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset
 SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset
 SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset
@@ -102,3 +103,5 @@ SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medi
 SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_B.uasset
 SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_N.uasset
 SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_ORM.uasset
+=======
+>>>>>>> 95f315ade3bf74f55a7ff178d6c65dfcb6ece4df