Chore/resolve conflicts (#400)

### Description

(PR description goes here)

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)

---------

Co-authored-by: mkolasinski-splunk <105011638+mkolasinski-splunk@users.noreply.github.com>
Co-authored-by: Dmytro Kvashnin <dkvashnin@splunk.com>
Co-authored-by: Dmytro Kvashnin <139753462+dkvashninsplunk@users.noreply.github.com>
Co-authored-by: mgrandys-splunk <153620320+mgrandys-splunk@users.noreply.github.com>
Co-authored-by: dvarasani-crest <151819886+dvarasani-crest@users.noreply.github.com>
Co-authored-by: kdoroszko-splunk <kdoroszko@splunk.com>

Author: 6 people