not saved

src/pages/RegisterPages/Register/Register.styled.js

 import styled from "styled-components";
 import ImagePicker from "../../../components/ImagePicker/ImagePicker";
 import selectedTheme from "../../../themes";
-<<<<<<< HEAD
 import { TextFont } from "../../../themes/primaryTheme/primaryThemeFonts";
-=======
 import { ReactComponent as ProfilePictureSVG } from "../../../assets/images/profile-picture.svg";
->>>>>>> master
 
 export const RegisterPageContainer = styled(Container)`
   margin-top: 72px;