diff --git a/PrototypWPFHAG/MainWindow.xaml b/PrototypWPFHAG/MainWindow.xaml
index 368e9a2..0deb55e 100644
--- a/PrototypWPFHAG/MainWindow.xaml
+++ b/PrototypWPFHAG/MainWindow.xaml
@@ -28,6 +28,10 @@
                     <PasswordBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordTextBox"
                     PasswordChanged="PasswordTextBox_PasswordChanged"/>
 
+<<<<<<< HEAD
+                <!-- 登录按钮 -->
+                <Button Height="30" Width="100" Content="Log in" Margin="0,20,0,0" Click="LoginButton_Click" />
+=======
                     <!-- Textbox for visible password (hidden at default) -->
                     <TextBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordVisibleTextBox"
                     Visibility="Collapsed" IsReadOnly="True"/>
@@ -41,6 +45,7 @@
                 <!-- Login Button -->
                 <Button Height="30" Width="100" Content="Zur Suche" Margin="0,20,0,0" 
                         Click="loginButton_Click" IsDefault="True" />
+>>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
             </StackPanel>
         </Border>
     </Grid>
diff --git a/PrototypWPFHAG/MainWindow.xaml.cs b/PrototypWPFHAG/MainWindow.xaml.cs
index 4365c5e..660ad52 100644
--- a/PrototypWPFHAG/MainWindow.xaml.cs
+++ b/PrototypWPFHAG/MainWindow.xaml.cs
@@ -1,4 +1,6 @@
 using System.Data;
+using System.Runtime.InteropServices;
+using System.Security.Principal;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -23,6 +25,14 @@ public partial class MainWindow : MetroWindow
     public MainWindow()
     {
         InitializeComponent();
+<<<<<<< HEAD
+        //TestConnection();
+        //Console.ReadKey();
+
+    }
+
+    private static void TestConnection()
+=======
     }
 
     private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -36,6 +46,7 @@ public partial class MainWindow : MetroWindow
     }
 
     private string ValidateUser(string username, string password)
+>>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
     {
         using (NpgsqlConnection con = GetConnection())
         {
@@ -68,8 +79,15 @@ public partial class MainWindow : MetroWindow
                 }
             }
         }
+<<<<<<< HEAD
+    }
+    private static NpgsqlConnection GetConnection()
+    {
+        return new NpgsqlConnection(@"Server=localhost;Port=7854;User Id=postgres;Database=postgres;");
+=======
 
         return "Erfolgreich";
+>>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
     }
 
     private void ShowPasswordButton_PreviewMouseDown(object sender, RoutedEventArgs e)
diff --git a/PrototypWPFHAG/PrototypWPFHAG.csproj b/PrototypWPFHAG/PrototypWPFHAG.csproj
index 334273d..346e347 100644
--- a/PrototypWPFHAG/PrototypWPFHAG.csproj
+++ b/PrototypWPFHAG/PrototypWPFHAG.csproj
@@ -25,7 +25,9 @@
 
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.69.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
     <PackageReference Include="PdfPig" Version="0.1.10" />