fix merge conflicts

common/components/Footer/index.jsx

@@ -17,7 +17,7 @@ export default class Footer extends Component {
                                 <p aria-hidden="true">
                                     <a href="/">
                                         {/* TODO - don't hardcode image path*/}
-                                        <img src={"https://www.myetherwallet.com/images/logo-myetherwallet.svg"}
+                                        <img src={'https://www.myetherwallet.com/images/logo-myetherwallet.svg'}
                                              height="55px" width="auto" alt="Ether Wallet"/>
                                     </a>
                                 </p>

common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordComponent.jsx

@@ -1,9 +1,9 @@
-import React, {Component} from "react";
-import PropTypes from "prop-types";
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 
-import {Field, reduxForm} from "redux-form";
-import GenerateWalletPasswordInputComponent from "./GenerateWalletPasswordInputComponent";
-import LedgerTrezorWarning from "./LedgerTrezorWarning";
+import {Field, reduxForm} from 'redux-form';
+import GenerateWalletPasswordInputComponent from './GenerateWalletPasswordInputComponent';
+import LedgerTrezorWarning from './LedgerTrezorWarning';
 import translate from "translations";
 
 
@@ -60,8 +60,8 @@ class GenerateWalletPasswordComponent extends Component {
             generateWalletFile,
             hasDownloadedWalletFile,
             generateWalletHasDownloadedFileAction,
-            generateWalletContinueToPaperAction,
-            canProceedToPaper
+            generateWalletContinueToPaperAction
+            // canProceedToPaper
 
         } = this.props;
 

common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordInputComponent.jsx

@@ -1,5 +1,5 @@
-import React, {Component} from "react";
-import PropTypes from "prop-types";
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 
 
 export default class GenerateWalletPasswordInputComponent extends Component {
@@ -22,7 +22,7 @@ export default class GenerateWalletPasswordInputComponent extends Component {
                     <div className="input-group" style={{width: '100%'}}>
                         <input {...this.props.input}
                                name="password"
-                               className={this.props.meta.error ? 'form-control is-invalid' : "form-control"}
+                               className={this.props.meta.error ? 'form-control is-invalid' : 'form-control'}
                                type={this.props.showPassword ? 'text' : 'password'}
                                placeholder="Do NOT forget to save this!"
                                aria-label="Enter a strong password (at least 9 characters)"/>
@@ -46,5 +46,3 @@ export default class GenerateWalletPasswordInputComponent extends Component {
     }
 
 }
-
-

common/containers/Tabs/GenerateWallet/components/LedgerTrezorWarning.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 
 const LedgerTrezorWarning = () => (
     <section className="row">

common/containers/Tabs/GenerateWallet/index.js

@@ -1,13 +1,13 @@
-import GenerateWalletPasswordComponent from "./components/GenerateWalletPasswordComponent";
-import React, {Component} from "react";
-import {connect} from "react-redux";
+import GenerateWalletPasswordComponent from './components/GenerateWalletPasswordComponent';
+import React, {Component} from 'react';
+import {connect} from 'react-redux';
 import {
     GENERATE_WALLET_FILE_ACTION,
     GENERATE_WALLET_HAS_DOWNLOADED_FILE_ACTION,
     SHOW_GENERATE_WALLET_PASSWORD_ACTION,
     GENERATE_WALLET_CONTINUE_TO_PAPER_ACTION
-} from "actions/generateWallet";
-import PropTypes from "prop-types";
+} from 'actions/generateWallet';
+import PropTypes from 'prop-types';
 
 class GenerateWallet extends Component {
     constructor(props) {

common/containers/Tabs/Help/index.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 
 const Help = () => (
     <section className="container" style={{minHeight: '50%'}}>

common/containers/Tabs/ViewWallet/index.js

@@ -1,4 +1,4 @@
-import React, {Component} from "react";
+import React, {Component} from 'react';
 
 export default class ViewWallet extends Component {
     constructor(props) {

common/reducers/generateWallet.js

@@ -4,7 +4,7 @@ import {
     GENERATE_WALLET_HAS_DOWNLOADED_FILE,
     GENERATE_WALLET_CONTINUE_TO_PAPER
 
-} from "actions/generateWallet";
+} from 'actions/generateWallet';
 
 
 const initialState = {

webpack_config/server.js

@@ -29,7 +29,7 @@ try {
 
 const devMiddleWare = require('webpack-dev-middleware')(compiler, {
     publicPath: webpackConfig.output.publicPath,
-    quiet: false,
+    quiet: true,
     inline: true,
     headers: {
         'Access-Control-Allow-Origin': '*',