diff --git a/src/sort/Bound.java b/src/sort/Bound.java
index 47b0eea9de7c3246259a0bda1d866292b606956a..c71737f7807c0bc48e876dd27a12539c74ba2d47 100644
--- a/src/sort/Bound.java
+++ b/src/sort/Bound.java
@@ -1,14 +1,12 @@
-<<<<<<< HEAD
+
 package sort;
 /**
  * Enumeration of bound types.
  * @author Christopher W. Schankula
  *
  */
-=======
-package sort;
-
->>>>>>> b093c71758057e7a5b83b69a7632a229ad1469bf
+
+
 public enum Bound {
 	LOWER, UPPER, LOWHIGH, ANY, EQUALS;
 }