conflicts

src/pages/App.scss

@@ -24,5 +24,6 @@
 #app-container {
   width: 100vw;
   height: 100vh;
+  
   @extend %col-nowrap;
 }
\ No newline at end of file

src/pages/Pool/CreateExchange.js

@@ -181,7 +181,6 @@ class CreateExchange extends Component {
             'header--inactive': !isConnected,
           })}
         />
-
         <ModeSelector title={t("createExchange")} />
         <AddressInputPanel
           title="Token Address"