diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index f1810a27219b35d2a59a54744974b66f168cd2b7..53fc27bc18b6522a6a6dfb6e40c7ef8e757be5c5 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -326,17 +326,24 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
         cuda-cudart-11-7                                                \
         cuda-compat-11-7                                                \
  && apt-get -yqq autoremove                                             \
+<<<<<<< HEAD
 <<<<<<< HEAD
  && ln -s cuda-11.7 /usr/local/cuda                                     \
+=======
+ && ln -s cuda-11.7 /usr/local/cuda &&                                  \
+>>>>>>> Add CUDA Post-Install commands
  && 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
 
+<<<<<<< HEAD
 =======
  && rm -rf /var/lib/apt/lists/*                                         
 
 >>>>>>> Add CUDA libraries
+=======
+>>>>>>> Add CUDA Post-Install commands
 ## copy over everything we need from staging in a single layer
 RUN --mount=from=staging,target=/staging                                \
     rm -rf /usr/local                                                   \