diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5c48bbc..d87cce4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -17,6 +17,9 @@
     HADOOP-12789. log classpath of ApplicationClassLoader at INFO level
     (Sangjin Lee via mingma)
 
+    HADOOP-13290. Appropriate use of generics in FairCallQueue. (Jonathan Hung
+    via zhz)
+
     HADOOP-13298. Fix the leftover L&N files in
     hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
 
@@ -36,18 +39,40 @@
     HADOOP-12589. Fix intermittent test failure of TestCopyPreserveFlag
     (iwasakims)
 
+    HADOOP-12559. KMS connection failures should trigger TGT renewal. (Zhe
+    Zhang via xiaoyuyao)
+
+    HADOOP-12682. Fix TestKMS#testKMSRestart* failure. (Wei-Chiu Chuang via
+    xiaoyuyao)
+
     HADOOP-12958. PhantomReference for filesystem statistics can trigger OOM
     (Sangjin Lee via jlowe)
 
     HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream
     with accurate .getPos() (kanaka kumar avvaru via vinayakumarb)
 
+    HADOOP-13042. Restore lost leveldbjni LICENSE and NOTICE changes. (wang)
+
+    HADOOP-13043. Add LICENSE.txt entries for bundled javascript dependencies.
+    (wang)
+
     HADOOP-12893. Verify LICENSE.txt and NOTICE.txt.
     (Xiao Chen and Andrew Wang via aajisaka)
 
+    HADOOP-13189. FairCallQueue makes callQueue larger than the configured
+    capacity. (Vinitha Gankidi via shvachko)
+
+    HADOOP-13255. KMSClientProvider should check and renew tgt when doing
+    delegation token operations. (Xiao Chen via xiaoyuyao)
+
+    HADOOP-13350. Additional fix to LICENSE and NOTICE. (Xiao Chen via wang)
+
     HADOOP-13297. Add missing dependency in setting
     maven-remote-resource-plugin to fix builds. (Sean Busbey via aajisaka)
 
+    HADOOP-13494. ReconfigurableBase can log sensitive information. (Sean
+    Mackrory via wang)
+
     HADOOP-13579. Fix source-level compatibility after HADOOP-11252.
     (Tsuyoshi Ozawa via aajisaka)
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e194f23..1d9331a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -14,9 +14,17 @@
     HDFS-9688. Test the effect of nested encryption zones in HDFS downgrade.
     (zhz)
 
+    HDFS-10264. Logging improvements in FSImageFormatProtobuf.Saver. (Xiaobing
+    Zhou via shvachko)
+
+    HDFS-2580. NameNode#main(...) can make use of GenericOptionsParser. (harsh)
+
     HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG
     level instead of INFO level. (Xiaoyu Yao via wheat9)
 
+    HDFS-10377. CacheReplicationMonitor shutdown log message should use INFO
+    level (Yiqun Lin via cmccabe)
+
     HDFS-9669. TcpPeerServer should respect ipc.server.listen.queue.size
     (Elliot Clark via cmccabe)
 
@@ -25,6 +33,9 @@
 
   OPTIMIZATIONS
 
+    HDFS-10653. Optimize conversion from path string to components. (Daryn
+    Sharp via zhz)
+
     HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via
     Colin P. McCabe)
 
@@ -33,12 +44,23 @@
     HDFS-9347. Invariant assumption in TestQuorumJournalManager.shutdown()
     is wrong. (Wei-Chiu Chuang via zhz)
 
+    HDFS-9752. Permanent write failures may happen to slow writers during
+    datanode rolling upgrades. (Walter Su via kihwal)
+
+    HDFS-10182. Hedged read might overwrite user's buf. (zhouyingchao via
+    Walter Su)
+
     HDFS-10271. Extra bytes are getting released from reservedSpace for append
     (Brahma Reddy Battula via vinayakumarb)
 
+    HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted
+    cluster. (zhz)
+
     HDFS-8581. ContentSummary on / skips further counts on yielding lock
     (J.Andreina via vinayakumarb)
 
+    HDFS-10544. Balancer doesn't work with IPFailoverProxyProvider. (zhz)
+
     HDFS-9530. ReservedSpace is not cleared for abandoned Blocks.
     (Brahma Reddy Battula)
 
@@ -107,9 +129,6 @@
     HDFS-9220. Reading small file (< 512 bytes) that is open for append fails
     due to incorrect checksum (Jing Zhao via kihwal)
 
-    HDFS-9752. Permanent write failures may happen to slow writers during
-    datanode rolling upgrades. (Walter Su via kihwal)
-
 Release 2.6.3 - 2015-12-17
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index d4947c1..6c32fae 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -30,6 +30,10 @@
     MAPREDUCE-6302. Preempt reducers after a configurable timeout 
     irrespective of headroom. (kasha via wangda)
 
+    MAPREDUCE-6514. Fixed MapReduce ApplicationMaster to properly updated
+    resources ask after ramping down of all reducers avoiding job hangs. (Varun
+    Saxena and Wangda Tan via vinodkv)
+
     MAPREDUCE-6689. MapReduce job can infinitely increase number of reducer
     resource requests (Wangda Tan via jlowe)
 
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 42e3f3b..89ce60a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -167,17 +167,10 @@
 
     YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda)
 
-<<<<<<< HEAD
     YARN-4434. NodeManager Disk Checker parameter documentation is not correct.
     (Weiwei Yang via aajisaka)
 
 Release 2.6.2 - 2015-10-28
-=======
-    YARN-3893. Both RM in active state when Admin#transitionToActive failure 
-    from refeshAll() (Bibin A Chundatt via rohithsharmaks)
-
-Release 2.7.1 - 2015-07-06
->>>>>>> 7d6687f... YARN-3893. Both RM in active state when Admin#transitionToActive failure from refeshAll() (Bibin A Chundatt via rohithsharmaks)
 
   INCOMPATIBLE CHANGES