diff --git a/notes/计算机操作系统.md b/notes/计算机操作系统.md
index ffaca227..957f0d8a 100644
--- a/notes/计算机操作系统.md
+++ b/notes/计算机操作系统.md
@@ -455,9 +455,17 @@ down 和 up 操作需要被设计成原语，不可分割，通常的做法是
 
 
 ```c
+<<<<<<< HEAD
 
 typedef int semaphore;
 
+=======
+<<<<<<< HEAD
+typedef int  semaphore ;
+=======
+typedef int semaphore;
+>>>>>>> bedf25d3f0312d8e38953d742d42dbf87585980e
+>>>>>>> parent of b64ecc6... auto commit
 semaphore mutex = 1;
 
 void P1() {
@@ -501,9 +509,17 @@ void P2() {
 ```c
 
 #define N 100
+<<<<<<< HEAD
 
 typedef int semaphore;
 
+=======
+<<<<<<< HEAD
+typedef int  semaphore ;
+=======
+typedef int semaphore;
+>>>>>>> bedf25d3f0312d8e38953d742d42dbf87585980e
+>>>>>>> parent of b64ecc6... auto commit
 semaphore mutex = 1;
 
 semaphore empty = N;