diff --git a/README.md b/README.md
index 25af853..ebcb481 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,11 @@ If you want to uninstall the Kiwix tools:
 ninja -C build uninstall
 ```
 
+<<<<<<< HEAD
 Like for the installation, you might need to run the command as `root`
+=======
+Like for the installation, you might need to run the command as root
+>>>>>>> Various README.md improvements
 (or using `sudo`).
 
 Docker
@@ -161,4 +165,4 @@ License
 -------
 
 [GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
-[LICENSE](LICENSE) for more details.
+[COPYING](COPYING) for more details.