diff --git a/src/throttler-module-options.interface.ts b/src/throttler-module-options.interface.ts
index ef5d1c3ca..48ab57614 100644
--- a/src/throttler-module-options.interface.ts
+++ b/src/throttler-module-options.interface.ts
@@ -1,9 +1,12 @@
 import { ExecutionContext, ModuleMetadata, Type } from '@nestjs/common/interfaces';
 import { ThrottlerStorage } from './throttler-storage.interface';
+<<<<<<< HEAD
 
 export type Resolvable<T extends number | string | boolean> =
   | T
   | ((context: ExecutionContext) => T | Promise<T>);
+=======
+>>>>>>> ccc52db (feat: allowfor multiple throttler contexts)
 
 /**
  * @publicApi
@@ -56,7 +59,11 @@ export type ThrottlerModuleOptions =
       /**
        * The storage class to use where all the record will be stored in.
        */
+<<<<<<< HEAD
       storage?: ThrottlerStorage;
+=======
+      storage?: Type<ThrottlerStorage>;
+>>>>>>> ccc52db (feat: allowfor multiple throttler contexts)
       /**
        * The named throttlers to use
        */
diff --git a/src/throttler.guard.ts b/src/throttler.guard.ts
index 33f5983f2..49da91106 100644
--- a/src/throttler.guard.ts
+++ b/src/throttler.guard.ts
@@ -1,11 +1,15 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import * as md5 from 'md5';
+<<<<<<< HEAD
 import {
   Resolvable,
   ThrottlerModuleOptions,
   ThrottlerOptions,
 } from './throttler-module-options.interface';
+=======
+import { ThrottlerModuleOptions, ThrottlerOptions } from './throttler-module-options.interface';
+>>>>>>> ccc52db (feat: allowfor multiple throttler contexts)
 import { ThrottlerStorage } from './throttler-storage.interface';
 import { THROTTLER_LIMIT, THROTTLER_SKIP, THROTTLER_TTL } from './throttler.constants';
 import { InjectThrottlerOptions, InjectThrottlerStorage } from './throttler.decorator';