diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs
index f972854c1..446ac598a 100644
--- a/ui/admin/app/components/form/credential-store/index.hbs
+++ b/ui/admin/app/components/form/credential-store/index.hbs
@@ -1,6 +1,9 @@
 <Rose::Form
   @onSubmit={{@submit}}
+<<<<<<< HEAD
   @cancel={{@cancel}}
+=======
+>>>>>>> 9bf653f8 (feat: 🎸 Adding credential store edit form)
   @disabled={{@model.isSaving}}
   @showEditToggle={{if @model.isNew false true}}
   as |form|
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
index 0ff5c81bc..c3db9fd05 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
@@ -6,4 +6,4 @@
   @acknowledgeText={{t 'states.copied'}}
 >
   <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
+</Copyable>