From e53990362077a4d57761b861e268f2adf9201e38 Mon Sep 17 00:00:00 2001
From: KFK <80272258+kfklein15@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:35:08 +0100
Subject: [PATCH] Update Js2 S2 Day PD.md

---
 content/js2/sprints/2/day-plan/index.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content/js2/sprints/2/day-plan/index.md b/content/js2/sprints/2/day-plan/index.md
index 9951a0e79..d9462994b 100644
--- a/content/js2/sprints/2/day-plan/index.md
+++ b/content/js2/sprints/2/day-plan/index.md
@@ -4,6 +4,9 @@ layout = 'day-plan'
 emoji= '📝'
 menu_level = ['sprint']
 weight = 3
+[[blocks]]
+name="Conflict Resolution"
+src="https://cyf-pd.netlify.app/blocks/conflict-resolution/readme/"
 backlog= 'Module-JS2'
 backlog_filter= 'Week 2'
 +++