Resolve conflict

web/containers/Layout/BottomBar/index.tsx

@@ -1,3 +1,5 @@
+import { useState } from 'react'
+
 import {
   Badge,
   Button,
@@ -69,6 +71,7 @@ const BottomBar = () => {
           My Models 
           <ShortCut menu="E" />
         </Badge>
+
         {stateModel.state === 'start' && stateModel.loading && (
           <SystemItem
             titleBold
@@ -84,11 +87,7 @@ const BottomBar = () => {
           />
         )}
         {!stateModel.loading && downloadedModels.length !== 0 && (
-          <SystemItem
-            titleBold
-            name={activeModel?.id ? 'Active model' : ''}
-            value={activeModel?.id}
-          />
+          <SystemItem titleBold name={'Active model'} value={activeModel?.id} />
         )}
         {downloadedModels.length === 0 &&
           !stateModel.loading &&