diff --git a/src/tests/ofc24/Dockerfile b/src/tests/ofc24/Dockerfile
index 28c40bc5fa26fbf2c72498862d67eda184e41cc2..9e045221f94eb365b5c4568457ff77c5cac569f3 100644
--- a/src/tests/ofc24/Dockerfile
+++ b/src/tests/ofc24/Dockerfile
@@ -56,9 +56,15 @@ RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;
 # Create component sub-folders, get specific Python packages
 RUN mkdir -p /var/teraflow/tests/ecoc24
 WORKDIR /var/teraflow/tests/ecoc24
+<<<<<<< HEAD
 # COPY src/tests/ecoc24/requirements.in requirements.in
 # RUN pip-compile --quiet --output-file=requirements.txt requirements.in
 # RUN python3 -m pip install -r requirements.txt
+=======
+COPY src/tests/ecoc24/requirements.in requirements.in
+RUN pip-compile --quiet --output-file=requirements.txt requirements.in
+RUN python3 -m pip install -r requirements.txt
+>>>>>>> 0a67951cfdbf6c6d853a203e7f16882faf90f899
 
 # Add component files into working directory
 WORKDIR /var/teraflow