diff --git a/src/throttler.guard.ts b/src/throttler.guard.ts
index 49da91106..33f5983f2 100644
--- a/src/throttler.guard.ts
+++ b/src/throttler.guard.ts
@@ -1,15 +1,11 @@
 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';