From bf49f5ae53db63037b023ac3b0206d66972d67f8 Mon Sep 17 00:00:00 2001
From: jding25 <jding25@berkeley.edu>
Date: Tue, 19 Mar 2024 08:16:42 -0700
Subject: [PATCH] small modification due to merge conflict

---
 _modules/week-10.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/_modules/week-10.md b/_modules/week-10.md
index 36988bd..060242d 100644
--- a/_modules/week-10.md
+++ b/_modules/week-10.md
@@ -4,15 +4,9 @@ title: Week 10
 
 
 Mar 19
-<<<<<<< HEAD
 : **Lecture 18**{: .label .label-lecture} [Estimators, Bias, and Variance](lecture/lec18)
-
-: **Discussion 9**{: .label .label-disc } Cross-Validation and Regularization
-=======
-: **Lecture 18**{: .label .label-lecture} Estimators, Bias, and Variance
     : ([*Fa23 Note*](https://ds100.org/fa23-course-notes/probability_2/probability_2.html) - to be updated)
 : **Discussion 9**{: .label .label-disc } [Cross-Validation and Regularization](https://drive.google.com/file/d/1vN0y-HT6J3HJ5oE7E0g7gXB45rX0rALu/view?usp=sharing)
->>>>>>> 100a5965a354e5bb1e283dd119967a0201e05be7
 
 Mar 21
 : **Lecture 19**{: .label .label-lecture} Causal Inference and Confounding