Fix conflicts

acpi.ts

@@ -54,7 +54,6 @@ class ACPIController {
     acpi.stdout.addListener('data', (d: Buffer) => {
       const data = d.toString().trim()
       this.callbacks.forEach((cb) => {
-        console.log({ data })
         if (cb !== undefined) cb(data)
       })
     })

src/App.tsx

@@ -26,7 +26,7 @@ export default class MainApp extends Vue {
    * INFO: For High-DPI screens settings
    */
   initZoom() {
-    setCSSVariable('--zoom', AppModule.zoom + '')
+    setCSSVariable('--zoom', AppModule.zoom + '' || '1')
   }
 
   created() {

src/components/base/settings/general/SettingsSelectors.tsx

@@ -87,8 +87,7 @@ export default class SettingsSelectors extends Vue {
 
   @Debounce(100)
   updateZoom(value: AppInputThemeValue) {
-    setCSSVariable('--zoom', value + '')
-    console.log({ value })
+    setCSSVariable('--zoom', value + '' || '1')
     AppModule.SET_STATE_APP({ key: 'zoom', value: parseFloat(value + '') })
   }
 

src/store/app.ts

@@ -350,7 +350,7 @@ class App extends VuexModule implements AppState {
       this.SET_STATE_APP({ key: 'currentOs', value: settings.currentOs || 'arch-linux' })
       this.SET_STATE_APP({ key: 'desktop', value: settings.desktop })
       this.SET_STATE_APP({ key: 'username', value: settings.username })
-      this.SET_STATE_APP({ key: 'zoom', value: settings.zoom })
+      this.SET_STATE_APP({ key: 'zoom', value: settings.zoom || 1 })
     } catch (error) {
       this.setUpSettings()
     }