diff --git a/src/main/java/org/kuali/kfs/coa/businessobject/OrganizationReversion.java b/src/main/java/org/kuali/kfs/coa/businessobject/OrganizationReversion.java
index 936c6b6..204b1e1 100644
--- a/src/main/java/org/kuali/kfs/coa/businessobject/OrganizationReversion.java
+++ b/src/main/java/org/kuali/kfs/coa/businessobject/OrganizationReversion.java
@@ -22,12 +22,12 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-<<<<<<< HEAD
 import java.util.logging.Logger;
-=======
 import java.util.logging.Level;
->>>>>>> Added logging to my OrganizationReversion bo
 
+/**
+ * Merge conflicts are fun!
+ */
 public class OrganizationReversion {
 	
 	private static Logger LOG = Logger.getLogger(OrganizationReversion.class.getName());