misc: set up resolves-conflict-dependencies for K2 upgrade#1117

lauzadis merged 1 commit intomainsmithy-lang/smithy-kotlin:mainfrom

misc-resolves-conflict-dependenciessmithy-lang/smithy-kotlin:misc-resolves-conflict-dependenciesCopy head branch name to clipboard