diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 5f2682e..3879607 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,14 +1,7 @@
 {
   "ExpandedNodes": [
-    "",
-    "\\database",
-    "\\Properties",
-    "\\Properties\\DataSources"
+    ""
   ],
-<<<<<<< HEAD
-  "SelectedNode": "\\envios.cs",
-=======
-  "SelectedNode": "\\database\\DAO.cs",
->>>>>>> 3d33ff1e16cc8960f815f7a70dbce03e3275ec89
+  "SelectedNode": "\\Solution.sln",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo
index 81174d3..3728e5f 100644
Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b4126a5..10a1a65 100644
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ