fix merge conflict

src/components/structures/UserSettings.js

@@ -266,6 +266,11 @@ module.exports = React.createClass({
         });
     },
 
+    _onDeactivateAccountClicked: function() {
+        const DeactivateAccountDialog = sdk.getComponent("dialogs.DeactivateAccountDialog");
+        Modal.createDialog(DeactivateAccountDialog, {});
+    },
+
     _renderUserInterfaceSettings: function() {
         var client = MatrixClientPeg.get();
 
@@ -383,6 +388,20 @@ module.exports = React.createClass({
         )
     },
 
+    _renderDeactivateAccount: function() {
+        // We can't deactivate a guest account.
+        if (MatrixClientPeg.get().isGuest()) return null;
+
+        return <div>
+            <h3>Deactivate Account</h3>
+                <div className="mx_UserSettings_section">
+                    <button className="mx_UserSettings_button danger"
+                        onClick={this._onDeactivateAccountClicked}>Deactivate my account
+                    </button>
+                </div>
+        </div>;
+    },
+
     render: function() {
         var self = this;
         var Loader = sdk.getComponent("elements.Spinner");
@@ -552,6 +571,8 @@ module.exports = React.createClass({
                     </div>
                 </div>
 
+                {this._renderDeactivateAccount()}
+
                 </GeminiScrollbar>
             </div>
         );