Update docker-compose_opal.yml

Fix merge issues

Author: StuartWheater

docker-compose_opal.yml

@@ -1,10 +1,6 @@
 services:
     opal:
-<<<<<<< HEAD
-        image: datashield/opal_citest:5.1.2
-=======
-        image: obiba/opal:5.1.4
->>>>>>> origin/v6.3.3-dev
+        image: datashield/opal_citest:5.1.4
         ports:
             - "8443:8443"
         links:
@@ -24,8 +20,4 @@ services:
             - MONGO_INITDB_ROOT_USERNAME=root
             - MONGO_INITDB_ROOT_PASSWORD=foobar
     rock:
-<<<<<<< HEAD
-        image: datashield/rock-margin-devel-permissive:latest
-=======
         image: datashield/rock-margin-joule-permissive:latest
->>>>>>> origin/v6.3.3-dev