Updated changelogs

Signed-off-by: Pujal <[email protected]>

packages/cli/CHANGELOG.md

@@ -10,7 +10,7 @@ All notable changes to the Zowe CLI package will be documented in this file.
 
 ## `8.7.0`
 
--Enhancement: Added new command zowe zos-files download all-members-matching, (zowe files dl amm), to download members matching specified pattern(s). [#2359](https://github.com/zowe/zowe-cli/pull/2359)
+-Enhancement: Added new command zowe zos-files download all-members-matching, (zowe files dl amm), to download members matching specified pattern(s). The success message for the Download.allMembers API was changed from originally "Data set downloaded successfully" to "Member(s) downloaded successfully." The change also alters the commandResponse when using the --rfj flag. [#2359](https://github.com/zowe/zowe-cli/pull/2359)
 
 ## Recent Changes
 

packages/zosfiles/CHANGELOG.md

@@ -2,16 +2,13 @@
 
 All notable changes to the Zowe z/OS files SDK package will be documented in this file.
 
-<<<<<<< HEAD
 ## Recent Changes
 
 - Enhancement: Added a `List.membersMatchingPattern` method to download all members that match a DSLEVEL pattern.[#2359](https://github.com/zowe/zowe-cli/pull/2359)
-=======
 ## `8.8.3`
 
 - BugFix: Resolved issue where special characters could be corrupted when downloading a large file. [#2366](https://github.com/zowe/zowe-cli/pull/2366)
 
->>>>>>> origin/master
 ## `8.8.0`
 
 - Enhancement: Allows for passing a `.zosattributues` file path for the download encoding format via the `attributes` option on the `Download.ussFile` method. [#2322](https://github.com/zowe/zowe-cli/issues/2322)