diff --git a/UNB/Year 5/Semester 1/MAAC3113/In class notes.md b/UNB/Year 5/Semester 1/MAAC3113/In class notes.md
index 2dd48f9..7c5fba0 100644
--- a/UNB/Year 5/Semester 1/MAAC3113/In class notes.md	
+++ b/UNB/Year 5/Semester 1/MAAC3113/In class notes.md	
@@ -31,6 +31,7 @@
 	- Laser printers
 - MIDI facilitated the way devices speak to each other in regards to music information
 - Finale and Sibelius emerge as big notation software
+<<<<<<< HEAD
 - Cloud based solutions emerge as competitors
 ## Acoustics
 - Frequency - Pitch (Hz)
@@ -42,4 +43,8 @@
 - Overtones - Tones above the fundamental (partials)
 - Pitch (Musician Name)
 - Loudness (Musician Name)
-- Articulation
\ No newline at end of file
+- Articulation
+=======
+- Cloud based solutions emerge as compeditors
+
+>>>>>>> 1f3607c (2024-10-07 13:32:37)