FIXED STUFF FROM THE MERGE SORRY ;_;

app/javascript/mastodon/actions/compose.js

@@ -72,7 +72,7 @@ export function mentionCompose(account, router) {
 
 export function submitCompose() {
   return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
+    let status = getState().getIn(['compose', 'text'], '');
 
     if (!status || !status.length) {
       return;

app/javascript/mastodon/reducers/index.js

@@ -34,11 +34,8 @@ const reducers = {
   statuses,
   relationships,
   settings,
-<<<<<<< HEAD
   local_settings,
-=======
   push_notifications,
->>>>>>> upstream
   cards,
   reports,
   contexts,