diff --git a/README.md b/README.md
index 9b137879a37fa865aa9d0c889b5c7010e6db4350..55177cc3261c5c4b54e222cbd72e038acf24259b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## Project #3: Implementing synchronization primitives
 
 ### *** Due on 11:59:59pm, June 12 (Friday)***
@@ -99,3 +100,7 @@ Implement the spinlock and blocking mutex that we learned in the class. And then
 
 - *THE INSTRUCTOR WILL NOT ANSWER THE QUESTIONS ABOUT THOSE ALREADY SPECIFIED ON THE HANDOUT.*
 - *QUESTIONS OVER EMAIL WILL BE IGNORED UNLESS IT CONCERNS YOUR PRIVACY.*
+=======
+# os-project3
+
+>>>>>>> 903beeeca118566b1454bce04f74369ded8540c5