diff --git a/PrototypWPFHAG/MainWindow.xaml b/PrototypWPFHAG/MainWindow.xaml
index 0deb55e..368e9a2 100644
--- a/PrototypWPFHAG/MainWindow.xaml
+++ b/PrototypWPFHAG/MainWindow.xaml
@@ -28,10 +28,6 @@
                     <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"/>
@@ -45,7 +41,6 @@
                 <!-- Login Button -->
                 <Button Height="30" Width="100" Content="Zur Suche" Margin="0,20,0,0" 
                         Click="loginButton_Click" IsDefault="True" />
->>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
             </StackPanel>
         </Border>
     </Grid>