diff --git a/src/Pages/LoginPage/LoginPage.js b/src/Pages/LoginPage/LoginPage.js
index f7a4601..40d45ef 100644
--- a/src/Pages/LoginPage/LoginPage.js
+++ b/src/Pages/LoginPage/LoginPage.js
@@ -1,6 +1,5 @@
 import { useState } from "react";
 import "./LoginPage.css"
-<<<<<<< HEAD
 import Axios from "axios";
 
 function Registration() {
@@ -79,49 +78,3 @@ function Registration() {
 }
 
 export default Registration;
-=======
-
-function Registration() {
-    const [name, setName] = useState("");
-    const [age, setAge] = useState(0);
-    const [country, setCountry] = useState("");
-    const [position, setPosition] = useState("");
-    const [wage, setWage] = useState(0);
-  
-    return (
-        <div className="information">
-            <label>Name:</label>
-            <input type="text"
-                onChange={(event) => {
-                    setName(event.target.value);
-                }}/>
-            <label>Age:</label>
-            <input type="number"
-                onChange={(event) => {
-                    setAge(event.target.value);
-                }}/>
-            <label>Country:</label>
-            <input type="text"
-                onChange={(event) => {
-                    setCountry(event.target.value);
-                }}
-            />
-            <label>Position:</label>
-            <input type="text"
-                onChange={(event) => {
-                    setPosition(event.target.value);
-                }}
-            />
-            <label>Wage (year):</label>
-            <input type="number"
-                onChange={(event) => {
-                    setWage(event.target.value);
-                }}
-            />
-            <button>Register</button>
-        </div>
-    );
-}
-
-export default Registration;
->>>>>>> 390b7dfcaacbeb885aa9c1e2a2aed59ce20d6400