diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index a6e95ae160ebc153e4b4a33795932cc818a2425f..f1810a27219b35d2a59a54744974b66f168cd2b7 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -250,7 +250,11 @@ ENV CLICOLOR_FORCE=1                                                    \
 ## Install additional packages. Remove the auto-cleanup functionality
 ## for docker, as we're using the new buildkit cache instead.
 ## We install gcc-10 and g++-10 as they are not installed by default in
+<<<<<<< HEAD
 ## Ubuntu 20.04.
+=======
+## Ubuntu 20.04. Install CUDA runtime libraries.
+>>>>>>> Add CUDA libraries
 ## TODO: libyaml-cpp-dev is a dependency for afterburner. We can probably remove
 ##       this once afterburner is added to spack
 RUN --mount=type=cache,target=/var/cache/apt                            \
@@ -322,12 +326,17 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
         cuda-cudart-11-7                                                \
         cuda-compat-11-7                                                \
  && apt-get -yqq autoremove                                             \
+<<<<<<< HEAD
  && ln -s cuda-11.7 /usr/local/cuda                                     \
  && rm -rf /var/lib/apt/lists/*                                         
 
 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
 ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
 
+=======
+ && rm -rf /var/lib/apt/lists/*                                         
+
+>>>>>>> Add CUDA libraries
 ## copy over everything we need from staging in a single layer
 RUN --mount=from=staging,target=/staging                                \
     rm -rf /usr/local                                                   \