diff --git a/notes/剑指 offer 题解.md b/notes/剑指 offer 题解.md
index 6392c91b..b785b54d 100644
--- a/notes/剑指 offer 题解.md	
+++ b/notes/剑指 offer 题解.md	
@@ -1017,12 +1017,8 @@ public boolean match(char[] str, char[] pattern) {
 
 ```java
 public boolean isNumeric(char[] str) {
-<<<<<<< HEAD
     if (str == null)
         return false;
-=======
-    if(str.length==0||str==null) return false;
->>>>>>> 641325422fdf746c627924e530d56949740c0e18
     return new String(str).matches("[+-]?\\d*(\\.\\d+)?([eE][+-]?\\d+)?");
 }
 ```