fix lint

Signed-off-by: Billie Simmons <[email protected]>

packages/zowe-explorer/CHANGELOG.md

@@ -60,10 +60,6 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 - Resolved user interface bug with tables that caused an inconsistent table height within the VS Code Panel. [#3389](https://github.com/zowe/zowe-explorer-vscode/pull/3389)
 - Fixed an issue where opening a data set with the same starting pattern as an archived data set caused a REST API error (code 500) to appear in the editor. [#3407](https://github.com/zowe/zowe-explorer-vscode/pull/3407)
 - Fixed an issue where registering new profile types from a Zowe Explorer extender could cause an internal API error on startup. [#3412](https://github.com/zowe/zowe-explorer-vscode/pull/3412)
-  <<<<<<< HEAD
-  =======
-- Fixed issue where the 'Delete' key binding for the USS tree returns a 'contextValue' error. [#2796](https://github.com/zowe/zowe-explorer-vscode/issues/2796)
-  > > > > > > > origin/release/3.1
 
 ## `3.0.3`