diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst
index d3bae85b3..1fe9fe29b 100644
--- a/admin_manual/maintenance/upgrade.rst
+++ b/admin_manual/maintenance/upgrade.rst
@@ -72,9 +72,3 @@ Nextcloud release. Any apps that are not developed by Nextcloud show a 3rd party
 designation. **Install unsupported apps at your own risk**. Then, before the
 upgrade, all 3rd party apps must be disabled. After the upgrade is complete you
 may re-enable them.
-<<<<<<< HEAD
-
-.. nextcloud.com/install/:
-   https://nextcloud.com/install/
-=======
->>>>>>> d3d6ea5... Some more cleanup