diff --git a/ArrayManipulation.java b/ArrayManipulation.java
index 21bd42c..1ae9956 100644
--- a/ArrayManipulation.java
+++ b/ArrayManipulation.java
@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 //coding Team 53 :)
+=======
+//Coding Team 53 :)
+
+>>>>>>> df0ffdce1b2badd549db1092b03b5544360ca4d7
 import java.util.Arrays;
 
 public class ArrayManipulation {
@@ -53,4 +58,8 @@ public class ArrayManipulation {
 		
         
     }
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> df0ffdce1b2badd549db1092b03b5544360ca4d7