diff --git a/.gitignore b/.gitignore
index 1a71341..f69dcf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## Build outputs
 [Bb]in/
 [Oo]bj/
@@ -25,4 +26,39 @@
 
 ## Package files
 *.nupkg
-packages/
\ No newline at end of file
+packages/
+=======
+## Visual Studio Code files
+.vscode/
+*.code-workspace
+
+## Visual Studio files
+.vs/
+*.user
+*.userosscache
+*.sln.docstates
+
+## Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+
+## Database files
+AquaCare.Persistence/AquaCareDatenbank.db
+AquaCare.Persistence/AquaCareDatenbank.db-shm
+AquaCare.Persistence/AquaCareDatenbank.db-wal
+
+## .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
diff --git a/AquaCare.View/WerteWindow.axaml.cs b/AquaCare.View/WerteWindow.axaml.cs
index 65509d0..b5e9e84 100644
--- a/AquaCare.View/WerteWindow.axaml.cs
+++ b/AquaCare.View/WerteWindow.axaml.cs
@@ -1,6 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+<<<<<<< HEAD
 using AquaCare.Controller;
+=======
+>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
 using AquaCare.Persistence;
 using System;
 
@@ -8,11 +11,16 @@ namespace AquaCare.View
 {
     public partial class WerteWindow : Window
     {
+<<<<<<< HEAD
         private readonly WerteController _controller;
+=======
+        private readonly Datenbank _datenbank;
+>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
 
         public WerteWindow()
         {
             InitializeComponent();
+<<<<<<< HEAD
             _controller = new WerteController(new Datenbank());
             LoadData();
         }
@@ -21,6 +29,23 @@ namespace AquaCare.View
         {
             var werte = _controller.LoadWerte();
             WerteDataGrid.ItemsSource = werte; // Bindet die Werte an das DataGrid
+=======
+            _datenbank = new Datenbank();
+            LoadValues();
+        }
+
+        private void LoadValues()
+        {
+            try
+            {
+                var werte = _datenbank.GetValuesAsObjects();
+                WerteDataGrid.ItemsSource = werte; // Bindet die Werte an das DataGrid
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Fehler beim Laden der Werte: {ex.Message}");
+            }
+>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
         }
 
         private void CloseWindowClick(object? sender, RoutedEventArgs e)