diff --git a/.gitignore b/.gitignore
index fe382f7b..1452265e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,31 @@
 BP_Puralink
 BP_Revolute
-
 # Visual Studio 2015 user specific files
 .vs/
-
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
-
 # Precompiled Headers
 *.gch
 *.pch
-
 # Compiled Dynamic libraries
 *.so
 *.dylib
 *.dll
-
 # Fortran module files
 *.mod
-
 # Compiled Static libraries
 *.lai
 *.la
 *.a
 *.lib
-
 # Executables
 *.exe
 *.out
 *.app
 *.ipa
-
 # These project files can be generated by the engine
 *.xcodeproj
 *.xcworkspace
@@ -43,33 +35,30 @@ BP_Revolute
 *.sdf
 *.VC.db
 *.VC.opendb
-
 # Precompiled Assets
 SourceArt/**/*.png
 SourceArt/**/*.tga
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> main
 # Builds
 Build/*
-
+Builds/*
 # Whitelist PakBlacklist-<BuildConfiguration>.txt files
 !Build/*/
 Build/*/**
 !Build/*/PakBlacklist*.txt
-
 # Don't ignore icon files in Build
 !Build/**/*.ico
-
 # Built data for maps
 *_BuiltData.uasset
-
 # Configuration files generated by the Editor
 Saved/*
-
 # Compiled source files for the engine to use
 Intermediate/*
 Plugins/**/Intermediate/*
-
 # Cache files for the editor to use
 DerivedDataCache/*
-.DS_Store
+.DS_Store
\ No newline at end of file