diff --git a/changelog.d/20240222_101904_regis_fix_nightly_patches.md b/changelog.d/20240222_101904_regis_fix_nightly_patches.md
new file mode 100644
index 0000000..4fc6e33
--- /dev/null
+++ b/changelog.d/20240222_101904_regis_fix_nightly_patches.md
@@ -0,0 +1 @@
+- [Bugfix] Fix merge conflicts in nightly when trying to apply patches from the master branch. (by @regisb)
diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile
index 1cbad72..186867d 100644
--- a/tutor/templates/build/openedx/Dockerfile
+++ b/tutor/templates/build/openedx/Dockerfile
@@ -49,8 +49,10 @@ RUN git config --global user.email "tutor@overhang.io" \
 {%- if patch("openedx-dockerfile-git-patches-default") %}
 # Custom edx-platform patches
 {{ patch("openedx-dockerfile-git-patches-default") }}
+{%- elif EDX_PLATFORM_VERSION == "master" -%}
+# Patches in nightly node
 {%- else %}
-# Patch edx-platform
+# Patches in non-nightly mode
 # Prevent course structure cache infinite growth
 # https://github.com/openedx/edx-platform/pull/34210
 RUN curl -fsSL https://github.com/openedx/edx-platform/commit/ad201cd664b6c722cbefcbda23ae390c06daf621.patch | git am