Update .gitattributes

.gitattributes

@@ -55,9 +55,5 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.webp filter=lfs diff=lfs merge=lfs -text
 *.obj filter=lfs diff=lfs merge=lfs -text
 *.mtl filter=lfs diff=lfs merge=lfs -text
-<<<<<<< HEAD
-train/metadata.csv filter=lfs diff=lfs merge=lfs -text
-=======
 *.glb filter=lfs diff=lfs merge=lfs -text
->>>>>>> aa5297b (Upload glb files)
-Images/metadata.jsonl filter=lfs diff=lfs merge=lfs -text
+