diff --git a/packages/bee-q/src/components.d.ts b/packages/bee-q/src/components.d.ts
index 67b7ee12e..1f08e8a2e 100644
--- a/packages/bee-q/src/components.d.ts
+++ b/packages/bee-q/src/components.d.ts
@@ -595,12 +595,9 @@ export namespace Components {
         "value": string;
     }
     interface BqToast {
-<<<<<<< HEAD
         /**
           * Method to be called to hide the toast component
          */
-=======
->>>>>>> eac78e6 (fix(avatar): change badge position based on shape)
         "hide": () => Promise<void>;
         /**
           * If true will hide toast icon
@@ -614,23 +611,17 @@ export namespace Components {
           * Placement of toast
          */
         "placement": TToastPlacement;
-<<<<<<< HEAD
         /**
           * Method to be called to show the toast component
          */
-=======
->>>>>>> eac78e6 (fix(avatar): change badge position based on shape)
         "show": () => Promise<void>;
         /**
           * The length of time, in milliseconds, after which the toast will close itself
          */
         "time": number;
-<<<<<<< HEAD
         /**
           * This method can be used to display toasts in a fixed-position element that allows for stacking multiple toasts vertically
          */
-=======
->>>>>>> eac78e6 (fix(avatar): change badge position based on shape)
         "toast": () => Promise<void>;
         /**
           * Type of toast
diff --git a/packages/bee-q/src/components/avatar/bq-avatar.tsx b/packages/bee-q/src/components/avatar/bq-avatar.tsx
index 93dc5e850..ee56521d0 100644
--- a/packages/bee-q/src/components/avatar/bq-avatar.tsx
+++ b/packages/bee-q/src/components/avatar/bq-avatar.tsx
@@ -138,7 +138,7 @@ export class BqAvatar {
       <Host>
         <div
           class={{
-            avatar: true,
+            'bq-avatar': true,
             [`size--${this.size}`]: true,
             'rounded-[var(--bq-avatar--border-radius-circle)]': this.shape === 'circle',
             'rounded-[var(--bq-avatar--border-radius-squareXs)]': this.shape === 'square' && this.size === 'xsmall',
diff --git a/packages/bee-q/src/components/avatar/scss/bq-avatar.scss b/packages/bee-q/src/components/avatar/scss/bq-avatar.scss
index 5817c48a0..16f0206fe 100644
--- a/packages/bee-q/src/components/avatar/scss/bq-avatar.scss
+++ b/packages/bee-q/src/components/avatar/scss/bq-avatar.scss
@@ -8,7 +8,7 @@
   @apply relative inline-block;
 }
 
-.avatar {
+.bq-avatar {
   @apply relative overflow-hidden bg-[var(--bq-avatar-background)];
   @apply border-[length:var(--bq-avatar--border-width)] border-[color:var(--bq-avatar--border-color)];