Fix import merge conflicts, removing any that aren't needed anymore

Many imports were removed as part of refactoring work, so here we are.

src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js

@@ -18,12 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
-<<<<<<< HEAD
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
-=======
-import sdk from "../../../../..";
->>>>>>> develop
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";

src/components/views/settings/tabs/user/FlairUserSettingsTab.js

@@ -17,12 +17,6 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
-<<<<<<< HEAD
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import PropTypes from "prop-types";
-import {MatrixClient} from "matrix-js-sdk";
-=======
->>>>>>> develop
 
 export default class FlairUserSettingsTab extends React.Component {
     render() {