diff --git a/src/main/java/org/kuali/kfs/coa/businessobject/AICPAFunction.java b/src/main/java/org/kuali/kfs/coa/businessobject/AICPAFunction.java
index 267ffdb..095b6a7 100644
--- a/src/main/java/org/kuali/kfs/coa/businessobject/AICPAFunction.java
+++ b/src/main/java/org/kuali/kfs/coa/businessobject/AICPAFunction.java
@@ -22,6 +22,10 @@
 import java.util.LinkedHashMap;
 import org.apache.log4j;
 
+/**
+ * Merge conflicts are fun!
+ */
+
 public class AICPAFunction {
     private String financialAicpaFunctionCode;
     private String financialAicpaFunctionName;