diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 9da50a91ec..eb50b50158 100644
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -176,7 +176,7 @@
 
     - name: set_fact ceph_cmd
       set_fact:
-        ceph_cmd: "{{ container_binary + ' run --rm --net=host -v /etc/ceph:/etc/ceph:z -v /var/lib/ceph:/var/lib/ceph:z -v /var/run/ceph:/var/run/ceph:z --entrypoint=ceph ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph' }} --cluster {{ cluster }}"
+        ceph_cmd: "{{ container_binary + ' run --rm --net=host -v /etc/ceph:/etc/ceph:z -v /var/lib/ceph:/var/lib/ceph:ro -v /var/run/ceph:/var/run/ceph:z --entrypoint=ceph ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph' }} --cluster {{ cluster }}"
 
     - name: get current fsid
       command: "{{ ceph_cmd }} fsid"
diff --git a/library/ceph_volume.py b/library/ceph_volume.py
index 24de78ae66..76d409b0ce 100644
--- a/library/ceph_volume.py
+++ b/library/ceph_volume.py
@@ -186,7 +186,6 @@
 '''
 
 
-<<<<<<< HEAD
 def fatal(message, module):
     '''
     Report a fatal error and exit
@@ -198,10 +197,7 @@ def fatal(message, module):
         raise(Exception(message))
 
 
-def container_exec(binary, container_image):
-=======
 def container_exec(binary, container_image, mounts=None):
->>>>>>> b02d71c30 (ceph_volume: support overriding bind-mounts)
     '''
     Build the docker CLI to run a command inside a container
     '''