diff --git a/src/main/java/org/kuali/kfs/coa/businessobject/Organization.java b/src/main/java/org/kuali/kfs/coa/businessobject/Organization.java
index ca92882..202e2c1 100644
--- a/src/main/java/org/kuali/kfs/coa/businessobject/Organization.java
+++ b/src/main/java/org/kuali/kfs/coa/businessobject/Organization.java
@@ -26,6 +26,9 @@
 import java.util.Set;
 import java.util.logging.Logger;
 
+/**
+ * Merge conflicts are fun!
+ */
 public class Organization {
     private static Logger LOG = Logger.getLogger(Organization.class.getName());
     protected String organizationCode;