diff --git a/.env b/.env
deleted file mode 100644
index 8db17993d7..0000000000
--- a/.env
+++ /dev/null
@@ -1,4 +0,0 @@
-gist_token=<token>
-account_passphrase=<passphrase>
-account_password=<password>
-NODE_OPTIONS=--max-old-space-size=2048
\ No newline at end of file
diff --git a/apps/remix-ide-e2e/src/commands/verifyContracts.ts b/apps/remix-ide-e2e/src/commands/verifyContracts.ts
index e7dbf4a591..aef1b06217 100644
--- a/apps/remix-ide-e2e/src/commands/verifyContracts.ts
+++ b/apps/remix-ide-e2e/src/commands/verifyContracts.ts
@@ -17,6 +17,7 @@ function verifyContracts (browser: NightwatchBrowser, compiledContractNames: str
   browser
     .clickLaunchIcon('solidity')
     .pause(opts.wait)
+    .pause(5000)
     .waitForElementPresent('*[data-id="compiledContracts"] option', 60000)
     .perform((done) => {
       if (opts.version) {
diff --git a/libs/remix-ui/terminal/src/index.ts b/libs/remix-ui/terminal/src/index.ts
index 1735a3cf89..5b8eeca5b5 100644
--- a/libs/remix-ui/terminal/src/index.ts
+++ b/libs/remix-ui/terminal/src/index.ts
@@ -1 +1 @@
-export * from './lib/remix-ui-terminal';
+export * from './lib/remix-ui-terminal'
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
index 93322ab68d..d8754face6 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
@@ -287,8 +287,11 @@ element.style {
   .failed {
     color: var(--danger);
   }
+<<<<<<< HEAD
   .notavailable {
   }
+=======
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
   .call {
     font-size: 7px;
     border-radius: 50%;
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index a186d0a4a4..32d087c209 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -1,8 +1,13 @@
 import React, { useState, useEffect, useReducer, useRef, SyntheticEvent, MouseEvent } from 'react' // eslint-disable-line
 import { useKeyPress } from './custom-hooks/useKeyPress' // eslint-disable-line
 import { useWindowResize } from 'beautiful-react-hooks'
+<<<<<<< HEAD
 import { registerCommandAction, registerLogScriptRunnerAction, registerInfoScriptRunnerAction, registerErrorScriptRunnerAction, registerWarnScriptRunnerAction, registerRemixWelcomeTextAction, listenOnNetworkAction, initListeningOnNetwork } from './actions/terminalAction'
 import { initialState, registerCommandReducer, registerFilterReducer, addCommandHistoryReducer, registerScriptRunnerReducer, remixWelcomeTextReducer } from './reducers/terminalReducer'
+=======
+import { registerCommandAction, registerLogScriptRunnerAction, registerInfoScriptRunnerAction, registerErrorScriptRunnerAction, registerWarnScriptRunnerAction, listenOnNetworkAction, initListeningOnNetwork } from './actions/terminalAction'
+import { initialState, registerCommandReducer, addCommandHistoryReducer, registerScriptRunnerReducer, remixWelcomeTextReducer } from './reducers/terminalReducer'
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
 import { remixWelcome } from './reducers/remixWelcom' // eslint-disable-line
 import { getKeyOf, getValueOf, Objectfilter, matched } from './utils/utils'
 import {allCommands, allPrograms} from './commands' // eslint-disable-line
@@ -44,8 +49,12 @@ export interface RemixUiTerminalProps {
   registry: any,
   commands: any,
   txListener: any,
+<<<<<<< HEAD
   eventsDecoder: any,
   logHtml: any
+=======
+  eventsDecoder: any
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
 }
 
 export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
@@ -115,6 +124,10 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     registerInfoScriptRunnerAction(props.thisState, 'info', newstate.commands, scriptRunnerDispatch)
     registerWarnScriptRunnerAction(props.thisState, 'warn', newstate.commands, scriptRunnerDispatch)
     registerErrorScriptRunnerAction(props.thisState, 'error', newstate.commands, scriptRunnerDispatch)
+<<<<<<< HEAD
+=======
+
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
     registerCommandAction('html', _blocksRenderer('html'), { activate: true }, dispatch)
     registerCommandAction('log', _blocksRenderer('log'), { activate: true }, dispatch)
     registerCommandAction('info', _blocksRenderer('info'), { activate: true }, dispatch)
@@ -123,13 +136,20 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
 
     registerCommandAction('script', function execute (args, scopedCommands, append) {
       var script = String(args[0])
+<<<<<<< HEAD
       console.log({ script }, 'script')
+=======
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
       _shell(script, scopedCommands, function (error, output) {
         if (error) scriptRunnerDispatch({ type: 'error', payload: { message: error } })
         if (output) scriptRunnerDispatch({ type: 'script', payload: { message: '5' } })
       })
     }, { activate: true }, dispatch)
+<<<<<<< HEAD
   }, [props.thisState.autoCompletePopup, autoCompletState.text, props.logHtml])
+=======
+  }, [props.thisState.autoCompletePopup, autoCompletState.text])
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
 
   useEffect(() => {
     scrollToBottom()
@@ -820,7 +840,11 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
 
   const handlePaste = () => {
     setPaste(true)
+<<<<<<< HEAD
     setAutoCompleteState(prevState => ({ ...prevState, activeSuggestion: 0, showSuggestions: false}))
+=======
+    setAutoCompleteState(prevState => ({ ...prevState, activeSuggestion: 0, showSuggestions: false }))
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
   }
 
   return (
@@ -876,15 +900,26 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
         {
           handleAutoComplete()
         }
+<<<<<<< HEAD
         <div data-id='terminalContainerDisplay' style = {{
           position: 'absolute',
           height: '100%',
           width: '100%',
+=======
+        <div data-id="terminalContainerDisplay" style = {{
+          position: 'absolute',
+          height: '100',
+          width: '100',
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
           opacity: '0.1',
           zIndex: -1
         }}></div>
         <div className="terminal">
+<<<<<<< HEAD
           <div id='journal' className='journal' data-id='terminalJournal'>
+=======
+          <div id="journal" className="journal" data-id="terminalJournal">
+>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
             {!clearConsole && <TerminalWelcomeMessage packageJson={props.version}/>}
             {newstate.journalBlocks && newstate.journalBlocks.map((x, index) => {
               if (x.name === 'emptyBlock') {
diff --git a/nx.json b/nx.json
index 1e8bd051a7..017cd39c34 100644
--- a/nx.json
+++ b/nx.json
@@ -106,6 +106,8 @@
     "remix-ui-checkbox": {
       "tags": []
     },
+"remix-ui-terminal": {
+    },
     "remix-core-plugin": {
       "tags": []
     },
diff --git a/tsconfig.json b/tsconfig.json
index 6204014228..e19463be66 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,8 +14,35 @@
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
-    "paths": {},
-    "allowSyntheticDefaultImports": true
+    "paths": {
+      "@remix-project/remix-analyzer": ["dist/libs/remix-analyzer/index.js"],
+      "@remix-project/remix-astwalker": ["dist/libs/remix-astwalker/index.js"],
+      "@remix-project/remix-debug": ["dist/libs/remix-debug/src/index.js"],
+      "@remix-project/remix-lib": ["dist/libs/remix-lib/src/index.js"],
+      "@remix-project/remix-simulator": ["dist/libs/remix-simulator/src/index.js"],
+      "@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"],
+      "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"],
+      "@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"],
+      "@remixproject/debugger-plugin": ["apps/debugger/src/index.ts"],
+      "@remix-project/remixd": ["dist/libs/remixd/index.js"],
+      "@remix-ui/tree-view": ["libs/remix-ui/tree-view/src/index.ts"],
+      "@remix-ui/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"],
+      "@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"],
+      "@remix-ui/clipboard": ["libs/remix-ui/clipboard/src/index.ts"],
+      "@remix-project/remix-solidity-ts": ["libs/remix-solidity/src/index.ts"],
+      "@remix-ui/modal-dialog": ["libs/remix-ui/modal-dialog/src/index.ts"],
+      "@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"],
+      "@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"],
+      "@remix-ui/workspace": ["libs/remix-ui/workspace/src/index.ts"],
+      "@remix-ui/static-analyser": ["libs/remix-ui/static-analyser/src/index.ts"],
+      "@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"],
+      "@remix-ui/terminal": ["libs/remix-ui/terminal/src/index.ts"],
+      "@remix-ui/settings": ["libs/remix-ui/settings/src/index.ts"],
+      "@remix-project/core-plugin": ["libs/remix-core-plugin/src/index.ts"],
+      "@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"],
+      "@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"],
+      "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"]
+    }
   },
   "exclude": ["node_modules", "tmp"]
 }