diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index e1a987ec1..6e954285c 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -47,6 +47,8 @@ export default class ModalRoot extends React.PureComponent {
     return {
       overflowY: visible ? 'hidden' : null,
     };
+  }
+
   state = {
     revealed: false,
   };
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 782efe5e7..38df0b9b5 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -320,7 +320,6 @@ export default function compose(state = initialState, action) {
 
         return item;
       }));
-<<<<<<< HEAD
   case REDRAFT:
     return state.withMutations(map => {
       map.set('text', unescapeHTML(expandMentions(action.status)));
@@ -339,10 +338,8 @@ export default function compose(state = initialState, action) {
         map.set('spoiler_text', '');
       }
     });
-=======
   case COMPOSE_DOODLE_SET:
     return state.mergeIn(['doodle'], action.options);
->>>>>>> Doodle palette, options, fill tool (#172)
   default:
     return state;
   }
diff --git a/app/javascript/styles/doodle.scss b/app/javascript/styles/doodle.scss
index a4a1cfc84..8531cc85c 100644
--- a/app/javascript/styles/doodle.scss
+++ b/app/javascript/styles/doodle.scss
@@ -84,3 +84,13 @@ $doodleBg: #d9e1e8;
     }
   }
 }
+
+.compose-form__buttons-separator { 
+  border-left: 1px solid #c3c3c3; 
+  margin: 0 3px; 
+} 
+
+.compose-form__upload-button-icon {
+  line-height: 27px;
+}
+
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 24a361cbf..56fc524f6 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -373,15 +373,6 @@
     padding: 10px;
     cursor: pointer;
     border-radius: 4px;
-.compose-form__buttons-separator { 
-  border-left: 1px solid #c3c3c3; 
-  margin: 0 3px; 
-} 
-
-.compose-form__upload-button-icon {
-  line-height: 27px;
-}
-
     &:hover,
     &:focus,
     &:active,
@@ -5399,7 +5390,6 @@ noscript {
   }
 }
 
-<<<<<<< HEAD
 .trends {
   &__header {
     color: $dark-text-color;
@@ -5477,6 +5467,4 @@ noscript {
     }
   }
 }
-=======
 @import 'doodle';
->>>>>>> Doodle palette, options, fill tool (#172)