merge unconflict

package.json

@@ -65,6 +65,7 @@
     "build": {
         "appId": "xyz.defautluser0.notnextop",
         "productName": "Not-Nextop",
+	"executableName": "not-nextop",
         "files": [
             "!*",
             "!node_modules",
@@ -79,9 +80,10 @@
                 "discord"
             ]
         },
-        "beforePack": "scripts/build/sandboxFix.js",
+        "beforePack": "scripts/build/beforePack.mjs",
+        "afterPack": "scripts/build/afterPack.mjs",
         "linux": {
-            "icon": "build/icon.icns",
+            "icon": "build/icon.svg",
             "category": "Network",
             "maintainer": "jaegerwald.dev+nexop@gmail.com",
             "target": [
@@ -141,7 +143,8 @@
                 "NSMicrophoneUsageDescription": "This app needs access to the microphone",
                 "NSCameraUsageDescription": "This app needs access to the camera",
                 "com.apple.security.device.audio-input": true,
-                "com.apple.security.device.camera": true
+                "com.apple.security.device.camera": true,
+                "CFBundleIconName": "Icon"
             },
             "notarize": true
         },
@@ -171,6 +174,7 @@
             "oneClick": false
         },
         "win": {
+            "icon": "build/icon.ico",
             "target": [
                 {
                     "target": "nsis",