misc: add resolve-conflict-dependencies for event streaming#1412

lauzadis merged 1 commit intomainaws/aws-sdk-kotlin:mainfrom

fix-transform-2aws/aws-sdk-kotlin:fix-transform-2Copy head branch name to clipboard