diff --git a/300s School/NUCE 2100 - Fundamentals of Nuclear Engineering/2024-09-17 Homework 3.md b/300s School/NUCE 2100 - Fundamentals of Nuclear Engineering/2024-09-17 Homework 3.md
index 2635a6da..276cdf14 100644
--- a/300s School/NUCE 2100 - Fundamentals of Nuclear Engineering/2024-09-17 Homework 3.md	
+++ b/300s School/NUCE 2100 - Fundamentals of Nuclear Engineering/2024-09-17 Homework 3.md	
@@ -9,6 +9,7 @@ type: single
 endDate: null
 ---
 **Documentation**
+<<<<<<< HEAD
 - [x] NUCE2100 HW3 📅 2024-09-17 ✅ 2024-09-17
 	- [x] Problem 1 ⏳ 2024-09-16 ✅ 2024-09-17
 	- [x] Problem 2 ⏳ 2024-09-16 ✅ 2024-09-17
@@ -17,4 +18,15 @@ endDate: null
 	- [x] Problem 5 ⏳ 2024-09-16 ✅ 2024-09-17
 	- [x] Problem 6 ⏳ 2024-09-16 ✅ 2024-09-17
 	- [x] Problem 7 ⏳ 2024-09-16 ✅ 2024-09-17
-	- [x] Problem 8 ⏳ 2024-09-16 ✅ 2024-09-17
\ No newline at end of file
+	- [x] Problem 8 ⏳ 2024-09-16 ✅ 2024-09-17
+=======
+- [<] NUCE2100 HW3 📅 2024-09-17 
+	- [x] Problem 1 ⏳ 2024-09-16 
+	- [<] Problem 2 ⏳ 2024-09-16 
+	- [<] Problem 3 ⏳ 2024-09-16 
+	- [<] Problem 4 ⏳ 2024-09-16 
+	- [<] Problem 5 ⏳ 2024-09-16 
+	- [<] Problem 6 ⏳ 2024-09-16 
+	- [<] Problem 7 ⏳ 2024-09-16 
+	- [<] Problem 8 ⏳ 2024-09-16 
+>>>>>>> origin/master