diff --git a/src/redux/types.ts b/src/redux/types.ts
index 1555971e..5fe4e045 100644
--- a/src/redux/types.ts
+++ b/src/redux/types.ts
@@ -113,9 +113,5 @@ export interface INode {
   updatedAt?: string;
 }
 
-<<<<<<< HEAD
-export type IUploadProgressHandler = (progressEvent: any) => void;
-=======
 export type IUploadProgressHandler = (current: number, total: number) => void;
 export type IValidationErrors = Record<string, keyof typeof ERRORS>;
->>>>>>> 148974ab7db3e8500e236e312dd546d39e5c322b