conflicts cdk
