update web and fix merge

web/src/components/Settings/SecondarySettingsComponent.jsx

@@ -85,6 +85,16 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
         label={t('SettingsDialog.DHT')}
         labelPlacement='start'
       />
+      <TextField
+        onChange={inputForm}
+        margin='normal'
+        id='DhtConnectionLimit'
+        label={t('SettingsDialog.DhtConnectionLimit')}
+        value={DhtConnectionLimit}
+        type='number'
+        variant='outlined'
+        fullWidth
+      />
       <br />
       <TextField
         onChange={inputForm}