diff --git a/README.md b/README.md
index 7498e27aba07906f0ac42153fc61cc996cc10352..8522b3c61f7a63e2dc547f8039b8a73f897c8325 100644
--- a/README.md
+++ b/README.md
@@ -72,46 +72,6 @@ Access the service by:
 Response is in JSON format.
 
 
-<<<<<<< HEAD
-#### Daemon service mode
-This mode uses the code in:
-
-    wsgid.py
-    query_server_d.py
-
-It requires a couple of processes to run before the deamonised service
-can work. These processes run within the container, so, after running
-it, one can launch them attaching to the running container with
-
-    podman exec -it sedmod-test /bin/bash
-
-and within it run
-
-    python -m Pyro4.naming &
-		python query-server_d.py &
-
-After that, on can exit the shell and the daemon-based service should be
-reachable at
-
-    http://host.server:8080/seddaemon
-
-with the same usage of the single query one.
-
-### Network Proxy
-Since it could be annoying to explitly use port 8080 on the host, the
-service can be made visible on a specific context path in the host
-server's http using the httpd _ProxyPass_ directive, like
-  
-    <Location "/sedmods">
-        ProxyPass "http://localhost:8080"
-    </Location>
-
-where _/sedmods_ is an example and the _8080_ port depends on the passed
-parameters to the podman run command (see above).
-
-## SED Models HDF5 file
-This is preserved, currently, on the INAF ICT Owncloud instance.
-
 ## Dependencies
 
 On the host:
@@ -124,5 +84,3 @@ Within the container (i.e. provided in the build):
  - pandas
  - Pyro4 (deamon mode)
  - (py)tables
-=======
->>>>>>> modifs-on-vlkb