diff --git a/components/Carbon.js b/components/Carbon.js
index 1b38dac..1e55a83 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -126,7 +126,7 @@ class Carbon extends React.Component {
               padding: 18px 18px;
               border-radius: 5px;
               font-family: Hack, monospace !important;
-              font-size: 0.7rem;
+              font-size: 0.8rem;
               user-select: none;
             }
 
diff --git a/components/Meta.js b/components/Meta.js
index 74cb8e9..33398ab 100644
--- a/components/Meta.js
+++ b/components/Meta.js
@@ -20,13 +20,8 @@ export default () => (
       <link rel="shortcut icon" href="/static/favicon.ico" />
       <link rel="stylesheet" href='//cdnjs.cloudflare.com/ajax/libs/codemirror/5.26.0/codemirror.min.css' />
       {
-<<<<<<< HEAD
-        THEMES.map((theme, i) => (
-          <link key={i} rel="stylesheet" href={theme.link || `//cdnjs.cloudflare.com/ajax/libs/codemirror/5.30.0/theme/${theme.id}.min.css`}/>
-=======
         THEMES_ARRAY.map((theme, i) => (
-          <link key={i} rel="stylesheet" href={`//cdnjs.cloudflare.com/ajax/libs/codemirror/5.30.0/theme/${theme.id}.min.css`}/>
->>>>>>> Default theme
+          <link key={i} rel="stylesheet" href={theme.link || `//cdnjs.cloudflare.com/ajax/libs/codemirror/5.30.0/theme/${theme.id}.min.css`}/>
         ))
       }
       <link rel="stylesheet" href="//cdn.jsdelivr.net/font-hack/2.020/css/hack-extended.min.css" />