refactor: resolve conflicts

Author: jexjws

goldens/material/button/index.api.md

@@ -66,7 +66,11 @@ export type MatFabAnchor = MatFabButton;
 
 // @public
 export class MatFabButton extends MatButtonBase {
+<<<<<<< Updated upstream
     constructor(...args: unknown[]);
+=======
+    constructor();
+>>>>>>> Stashed changes
     expanded: boolean;
     // (undocumented)
     extended: boolean;

src/material/button/fab.ts

@@ -77,8 +77,6 @@ export class MatFabButton extends MatButtonBase {
   /** Whether the extended-FAB is currently expanded. Has no effect on non-extended FABs. */
   @Input({transform: booleanAttribute}) expanded: boolean = true;
 
-  constructor(...args: unknown[]);
-
   constructor() {
     super();
     this._options = this._options || defaults;