fixing merge conflicts

apps/solidity-compiler/src/app/compiler-api.ts

@@ -1,12 +1,13 @@
 import { compile } from '@remix-project/remix-solidity'
 import { CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
-import type { ConfigurationSettings } from '@remix-project/remix-lib-ts'
+import type { ConfigurationSettings } from '@remix-project/remix-lib-ts' // eslint-disable-line
 
 export const CompilerApiMixin = (Base) => class extends Base {
   currentFile: string
   contractMap: {
     file: string
   } | Record<string, any>
+
   compileErrors: any
   compileTabLogic: CompileTabLogic
   contractsDetails: Record<string, any>
@@ -282,7 +283,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
       }
     }
     this.on('themeModule', 'themeChanged', this.data.eventHandlers.onThemeChanged)
-    
     // Run the compiler instead of trying to save the website
     this.data.eventHandlers.onKeyDown = (e) => {
       // ctrl+s or command+s

nx.json

@@ -124,6 +124,9 @@
     "remix-ui-terminal": {
           "tags": []
     },
+    "solidity-compiler": {
+      "tags": []
+    },
     "solidity-compiler": {
       "tags": []
     }