diff --git a/admin_manual/configuration/server_to_server_managing.rst b/admin_manual/configuration/server_to_server_managing.rst
index 20be76816..b9b800e1b 100644
--- a/admin_manual/configuration/server_to_server_managing.rst
+++ b/admin_manual/configuration/server_to_server_managing.rst
@@ -1,7 +1,6 @@
 Configuring Server-to-Server Sharing
 ========================================
 
-<<<<<<< HEAD
 ownCloud 7 introduces a powerful new feature, server-to-server sharing. With 
 just a few clicks you can easily and securely create public shares for sharing 
 files and directories with other ownCloud 7 servers. You can automatically send 
@@ -58,5 +57,3 @@ such as ``http://192.168.10.50``, then your share URL will be something like
 LAN. This also applies to using the server name; for access outside of your LAN 
 you need to use a fully-qualified domain name such as 
 ``http://myserver.example.com``, rather than ``http://myserver``.
-
->>>>>>> d8d985742fbb0bbaeb7fec43457f0a77816c973e