diff --git a/frontend/components/Editor/components/Toolbar/components/LinkToolbar.js b/frontend/components/Editor/components/Toolbar/components/LinkToolbar.js
index 5d561902..cac76ed9 100644
--- a/frontend/components/Editor/components/Toolbar/components/LinkToolbar.js
+++ b/frontend/components/Editor/components/Toolbar/components/LinkToolbar.js
@@ -4,13 +4,8 @@ import styled from 'styled-components';
 import ToolbarButton from './ToolbarButton';
 import type { State } from '../../../types';
 import keydown from 'react-keydown';
-<<<<<<< HEAD
-import styles from '../Toolbar.scss';
 import Icon from 'components/Icon';
-=======
 import Flex from 'components/Flex';
-import CloseIcon from 'components/Icon/CloseIcon';
->>>>>>> Refactor CSS modules out
 
 @keydown
 export default class LinkToolbar extends Component {