Fix merge conflict - Githubissues

Please ensure your pull request (PR) adheres to the following guidelines:

Please refer to our contributing documentation for any questions on submitting a pull request, link: Contribution Guide

Pull Request Checklist

[ ] Testing of all the changes has been performed (for bug fixes / features)
[ ] The manual_readme_content.md has been reviewed and added / updated if needed (for bug fixes / features)
[ ] Use the following format for the PR description: <App Name>: <PR Type> - <PR Description>
[ ] Provide release notes as part of the PR submission which describe high level points about the changes for the upcoming GA release.
[ ] Verify all checks are passing.
[ ] Do NOT use the next branch of the forked repo. Create separate feature branch for raising the PR.
[ ] Do NOT submit updates to dependencies unless it fixes an issue.
Pull Request Type

[ ] If you are exposing any endpoints using a REST handler, please document them in the manual_readme_content.md.
[ ] If this is a new connector or you are adding new actions
- [ ] Please document in the manual_readme_content.md all methods (eg, OAuth) used to authenticate with the service that the connector is integrating with.
- [ ] If any actions are unable to run on SOAR Cloud, please document this in the manual_readme_content.md.
[ ] Are you introducing any new cryptography modules? If yes, please elaborate their purpose:
[ ] Are you are accessing the file system? If yes, please verify that you are only accessing paths returned through the Vault API.
[ ] Are you are marking code to be ignored by Semgrep with nosemgrep? If yes, please provide justification in an additional comment next to the ignored code.

Provide release notes as part of the PR submission which describe high level points about the changes for the upcoming GA release.

Any other information that is important to this PR such as screenshots of how the component looks before and after the change.

Any specific code change or test case points which must be addressed/reviewed at the time of GA release.

Thanks for contributing!