diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 87dbf32b5cc..ef54170d4c5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -34,6 +34,7 @@ Branch YARN-321: Generic ApplicationHistoryService
   YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen
   via vinodkv)
 
+<<<<<<< .working
   YARN-1123. Added a new ContainerReport and its Protobuf implementation. (Mayank
   Bansal via vinodkv)
 
@@ -94,6 +95,9 @@ Branch YARN-321: Generic ApplicationHistoryService
   YARN-1625. Fixed RAT warnings after YARN-321 merge. (Shinichi Yamashita via
   vinodkv)
 
+  YARN-1613. Fixed the typo with the configuration name
+  YARN_HISTORY_SERVICE_ENABLED. (Akira Ajisaka via vinodkv)
+
 Release 2.4.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 7fc8165813f..ea9b93aae15 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -950,7 +950,7 @@ public class YarnConfiguration extends Configuration {
 
   /** The setting that controls whether history-service is enabled or not.. */
   public static final String YARN_HISTORY_SERVICE_ENABLED = AHS_PREFIX
-      + ".enabled";
+      + "enabled";
   public static final boolean DEFAULT_YARN_HISTORY_SERVICE_ENABLED = false;
 
   /** URI for FileSystemApplicationHistoryStore */