resolved merge conflicts

Author: tylerymarkowitz

src/autocomplete/ResourcePropertyCompletionProvider.ts

@@ -4,11 +4,6 @@ import {
     CREATION_POLICY_SCHEMA,
     CreationPolicyPropertySchema,
 } from '../artifacts/resourceAttributes/CreationPolicyPropertyDocs';
-import {
-    supportsUpdatePolicy,
-    UPDATE_POLICY_SCHEMA,
-    UpdatePolicyPropertySchema,
-} from '../artifacts/resourceAttributes/UpdatePolicyPropertyDocs';
 import {
     deletionPolicyValueDocsMap,
     DELETION_POLICY_VALUES,