diff --git a/notes/Leetcode 题解.md b/notes/Leetcode 题解.md
index 73f19098..d10cf347 100644
--- a/notes/Leetcode 题解.md	
+++ b/notes/Leetcode 题解.md	
@@ -127,7 +127,7 @@ public int arrangeCoins(int n) {
     int l = 0, h = n;
     while(l <= h){
         int m = l + (h - l) / 2;
-        long x = m * (m + 1L) / 2;
+        long x = m * (m + 1) / 2;
         if(x == n) return m;
         else if(x < n) l = m + 1;
         else h = m - 1;
diff --git a/notes/Linux.md b/notes/Linux.md
index 135467a7..d6aa8c98 100644
--- a/notes/Linux.md
+++ b/notes/Linux.md
@@ -1375,7 +1375,7 @@ poll 和 select 在速度上都很慢。
 
 几乎所有的系统都支持 select，但是只有比较新的系统支持 poll。
 
-## eopll 工作模式
+## epoll 工作模式
 
 epoll_event 有两种触发模式：LT（level trigger）和 ET（edge trigger）。
 
diff --git a/notes/剑指 offer 题解.md b/notes/剑指 offer 题解.md
index 4f6bd9ad..c32cef34 100644
--- a/notes/剑指 offer 题解.md	
+++ b/notes/剑指 offer 题解.md	
@@ -102,7 +102,11 @@
 position-0 : (2,3,1,0,2,5) // 2 <-> 1
              (1,3,2,0,2,5) // 1 <-> 3
              (3,1,2,0,2,5) // 3 <-> 0
+<<<<<<< HEAD
              (0,1,2,3,2,5) // already in position
+=======
+             (0,1,2,3,2,5) // already in position
+>>>>>>> d1687d819fdd50d1b3323cfb327b355e2b5eca35
 position-1 : (0,1,2,3,2,5) // already in position
 position-2 : (0,1,2,3,2,5) // already in position
 position-3 : (0,1,2,3,2,5) // already in position
diff --git a/pics/54cb3f21-485b-4159-8bf5-dcde1c4d4c36.png b/pics/54cb3f21-485b-4159-8bf5-dcde1c4d4c36.png
index 3a69d2ce..cabb6685 100644
Binary files a/pics/54cb3f21-485b-4159-8bf5-dcde1c4d4c36.png and b/pics/54cb3f21-485b-4159-8bf5-dcde1c4d4c36.png differ
diff --git a/pics/dbc5c9f1-c13c-4d06-86ba-7cc949eb4c8f.jpg b/pics/dbc5c9f1-c13c-4d06-86ba-7cc949eb4c8f.jpg
deleted file mode 100644
index 6ff8388d..00000000
Binary files a/pics/dbc5c9f1-c13c-4d06-86ba-7cc949eb4c8f.jpg and /dev/null differ