diff --git a/.gitignore b/.gitignore
index d835732..33c892f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,17 @@
-.vs/*
-.vscode/*
-*.bin
-*.o
-net.pb.*
-*steam_api*
-release/*
-/build*/
-*.obj
-/dll/net.pb.cc
-/dll/net.pb.h
-base.exp
-base.lib
-rtlgenrandom*
-steamclient.exp
-steamclient.lib
-<<<<<<< .gitignore
-external
-.vs
-*.sln
-*.vcxproj*
-Debug
-Release
-Win32
-x64
-=======
-out/*
->>>>>>> .gitignore
\ No newline at end of file
+.vs/*
+.vscode/*
+*.bin
+*.o
+net.pb.*
+*steam_api*
+release/*
+/build*/
+*.obj
+/dll/net.pb.cc
+/dll/net.pb.h
+base.exp
+base.lib
+rtlgenrandom*
+steamclient.exp
+steamclient.lib
+out/*
\ No newline at end of file