diff --git a/src/app/ui/payment/payment-tab-tariffs.tsx b/src/app/ui/payment/payment-tab-tariffs.tsx
index b134d9c..f024172 100644
--- a/src/app/ui/payment/payment-tab-tariffs.tsx
+++ b/src/app/ui/payment/payment-tab-tariffs.tsx
@@ -1,7 +1,5 @@
-<<<<<<< HEAD
 'use client'
 
-import { useEffect } from 'react';
 import { getUserData } from '@/app/actions/action';
 import { useQuery } from '@tanstack/react-query';
 import { convertBytes } from '@/app/lib/convertBytes';
@@ -19,9 +17,6 @@ export default function PaymentTabTariffs() {
 		}
 	});
 
-=======
-export default function PaymentTabTariffs() {
->>>>>>> parent of 1e199de (edit registration)
 	return (
 		<div className="tab-content">
 			<div className="billing-toggle" style={{ display: 'none' }}>