diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index a6401f0..044ae22 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,11 +1,8 @@
 {
   "ExpandedNodes": [
-    ""
+    "",
+    "\\Empleados"
   ],
-<<<<<<< HEAD
   "SelectedNode": "\\Solution.sln",
-=======
-  "SelectedNode": "\\envios.cs",
->>>>>>> 010f91469a9ca650f92e32a39a66a4e1428f5b62
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo
index 3728e5f..5be49d3 100644
Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ
diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache
index efffae9..35665db 100644
Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ