diff --git a/components/Time.tsx b/components/Time.tsx
index d5d8c24..ec9229e 100644
--- a/components/Time.tsx
+++ b/components/Time.tsx
@@ -14,14 +14,7 @@ const Timer = () => {
 
     return(
         <div className={styles.time}>
-<<<<<<< HEAD
             <p><FaClock /> {date.toLocaleDateString('en-GB', { dateStyle: 'short' }) + ' • ' + date.toLocaleTimeString('en-GB', { timeStyle: 'medium', hour12: true,  timeZone: 'Europe/Budapest'}).toUpperCase()}</p>
-=======
-            <p><FontAwesomeIcon icon={['fas', 'clock']} /> {date.toLocaleString('en-GB', {
-                timeZone: 'Europe/Budapest',
-                hour12: true
-            }).toUpperCase()}</p>
->>>>>>> ce3c841bfc958c99053e0a03c56b5cbc56dff70f
         </div>
     )
 }
diff --git a/components/Weather.tsx b/components/Weather.tsx
index 4c3f7d8..69c25c4 100644
--- a/components/Weather.tsx
+++ b/components/Weather.tsx
@@ -7,7 +7,6 @@ const Weather = ({data}: {data: any}) => {
     const { icon: weatherIcon, description: weatherDescription} = data.weather[0]
 
     const icons: any = {
-<<<<<<< HEAD
         _01d: <FaSun />, _01n: <FaMoon />,
         _02d: <FaCloudSun />, _02n: <FaCloudMoon />,
         _03d: <FaCloud />, _03n: <FaCloud />,
@@ -17,17 +16,6 @@ const Weather = ({data}: {data: any}) => {
         _11d: <BsCloudLightningFill />, _11n: <BsCloudLightningFill />,
         _13d: <BsCloudSnowFill />, _13n: <BsCloudSnowFill />,
         _50d: <BsCloudFogFill />, _50n: <BsCloudFogFill />
-=======
-        _01d: ['fas', 'sun'], _01n: ['fas', 'moon'],
-        _02d: ['fas', 'cloud-sun'], _02n: ['fas', 'cloud-moon'],
-        _03d: ['fas', 'cloud'], _03n: ['fas', 'cloud'],
-        _04d: ['fas', 'clouds'], _04n: ['fas', 'clouds'],
-        _09d: ['fas', 'cloud-showers-heavy'], _09n: ['fas', 'cloud-showers-heavy'],
-        _10d: ['fas', 'cloud-showers-heavy'], _10n: ['fas', 'cloud-showers-heavy'],
-        _11d: ['fas', 'cloud-bolt-sun'], _11n: ['fas', 'cloud-bolt-moon'],
-        _13d: ['fas', 'snow-flake'], _13n: ['fas', 'snow-flake'],
-        _50d: ['fas', 'cloud-fog'], _50n: ['fas', 'cloud-fog']
->>>>>>> ce3c841bfc958c99053e0a03c56b5cbc56dff70f
     }
 
     return (