diff --git a/admin_manual/configuration_files/files_locking_transactional.rst b/admin_manual/configuration_files/files_locking_transactional.rst
index 2d319fb65..0ee6022ca 100644
--- a/admin_manual/configuration_files/files_locking_transactional.rst
+++ b/admin_manual/configuration_files/files_locking_transactional.rst
@@ -42,9 +42,7 @@ After installing Redis you must enter a simple configuration in your
        //'dbindex' => 0,
      ),
 
-The **Server status** section on your ownCloud Admin page indicates whether 
-<<<<<<< HEAD:admin_manual/configuration_files/files_locking_experimental.rst
-experimental file locking is enabled or disabled.
+The **Server status** section on your ownCloud Admin page indicates whether experimental file locking is enabled or disabled.
 
 .. figure:: ../images/transactional-locking-1.png