Fix rebase issues

app/javascript/flavours/glitch/components/status_action_bar.jsx

@@ -331,7 +331,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon={reblogIcon} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
         {
-          signedIn
+          permissions
             ? <EmojiPickerDropdown className='status__action-bar-button' onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
             : reactButton
         }

app/javascript/flavours/glitch/features/status/index.jsx

@@ -43,11 +43,7 @@ import { initMuteModal } from 'flavours/glitch/actions/mutes';
 import { initBlockModal } from 'flavours/glitch/actions/blocks';
 import { initReport } from 'flavours/glitch/actions/reports';
 import { initBoostModal } from 'flavours/glitch/actions/boosts';
-<<<<<<< HEAD
 import { makeCustomEmojiMap, makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
-=======
-import { makeGetStatus } from 'flavours/glitch/selectors';
->>>>>>> f0197c80d (display external custom emoji reactions properly)
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
 import ColumnBackButton from 'flavours/glitch/components/column_back_button';
 import ColumnHeader from '../../components/column_header';
@@ -706,12 +702,7 @@ class Status extends ImmutablePureComponent {
                   domain={domain}
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
-<<<<<<< HEAD
                   pictureInPicture={pictureInPicture}
-                  emojiMap={this.props.emojiMap}
-=======
-                  usingPiP={usingPiP}
->>>>>>> f0197c80d (display external custom emoji reactions properly)
                 />
 
                 <ActionBar

app/javascript/flavours/glitch/selectors/index.js

@@ -1,6 +1,6 @@
 import escapeTextContentForBrowser from 'escape-html';
 import { createSelector } from 'reselect';
-import { List as ImmutableList } from 'immutable';
+import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
 import { toServerSideType } from 'flavours/glitch/utils/filters';
 import { me } from 'flavours/glitch/initial_state';
 

app/javascript/mastodon/features/status/components/action_bar.jsx

@@ -7,12 +7,8 @@ import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import { me, maxReactions } from '../../../initial_state';
 import classNames from 'classnames';
-<<<<<<< HEAD
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
-=======
-import { PERMISSION_MANAGE_USERS } from 'mastodon/permissions';
 import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';
->>>>>>> 7cbe6dc3e (rebase with upstream)
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },

config/locales-glitch/simple_form.de.yml

@@ -1,7 +1,6 @@
 ---
 de:
   simple_form:
-<<<<<<< HEAD
     glitch_only: glitch-soc
     hints:
       defaults: