diff --git a/src/solution/Solution.java b/src/solution/Solution.java
index 5fc0272..49abce7 100644
--- a/src/solution/Solution.java
+++ b/src/solution/Solution.java
@@ -98,16 +98,6 @@ public class Solution {
         System.out.println(result);
     }
 
-<<<<<<< HEAD
-    public static int removeElement(int[] nums, int val) {
-        for (int i = 0; i < nums.length; i++) {
-            if (val == nums[i]){
-
-            }
-        }
-        return nums.length;
-    }
-=======
 //    public static String longestCommonPrefix(String[] strs) {
 //        int index = 0;
 //        StringBuilder temp = new StringBuilder();
@@ -158,6 +148,4 @@ public class Solution {
         }
         return strs[0];
     }
-
->>>>>>> a83429a6b794491f269fccaa74b710ca4abc514b
 }