diff --git a/.gitattributes b/.gitattributes
index fccaf5e..0d73977 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,9 @@
+<<<<<<< HEAD
+=======
+*.uasset filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.psd filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 2bf64669a35578a26fb57794375793e931527e0b
 Content/** filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file