diff --git a/.gitignore b/.gitignore
index 4635b7f..ba62150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,17 @@
 /.vs/RBMESAPICore/FileContentIndex
 /.vs/RBMESAPICore/v17
 /.vs/RBMESAPICore/DesignTimeBuild
+<<<<<<< HEAD
 /obj/Release/net6.0
+=======
+/obj/Debug/net6.0/RB_MES_APICore.AssemblyInfo.cs
+/obj/Debug/net6.0/RB_MES_APICore.AssemblyInfoInputs.cache
+/obj/Debug/net6.0/RB_MES_APICore.GeneratedMSBuildEditorConfig.editorconfig
+/obj/Debug/net6.0/RB_MES_APICore.assets.cache
+/obj/Debug/net6.0/RB_MES_APICore.csproj.AssemblyReference.cache
+/obj/RB_MES_APICore.csproj.nuget.dgspec.json
+/obj/RB_MES_APICore.csproj.nuget.g.props
+/obj/project.assets.json
+/obj/project.nuget.cache
+>>>>>>> c663257eb97b82030d15c4b0ea4e5a57a2963385
+/.vs