Fix CHANGES.txt for YARN-3840

hadoop-yarn-project/CHANGES.txt

@@ -15,24 +15,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no longer 
     binds to default port 8188. (Meng Ding via wangda)
 
-<<<<<<< HEAD
-=======
     YARN-3840. Resource Manager web ui issue when sorting application by id (with
     application having id > 9999) (Mohammad Shahid Khan via jianhe)
 
-Release 2.7.3 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
->>>>>>> a4ff03b... YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES