cleanup

Author: Theresa Lehr

.github/workflows/release-please-master.yml

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 ## -----------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See LICENSE.txt in the project root for license information.
@@ -10,7 +8,6 @@
 # It triggers on pushes to the main branch, generates a GitHub App token using organization
 # variables and secrets, and then runs the release-please-action to manage versioning and changelogs.
 
->>>>>>> dev
 name: Release Please for Master
 
 on: