Fix merge

src/components/modals/AddictionWarning.vue

@@ -16,8 +16,8 @@
                 playing incremental games is taking priority over other things in your life, or
                 manipulating your sleep schedule, it may be prudent to seek help.
             </p>
-            <p>
             <h4>Resources:</h4>
+            <p>
                 <span>
                     <a style="display: inline" href="https://www.samhsa.gov/" target="_blank">
                         SAMHSA

src/data/projInfo.json

@@ -3,7 +3,7 @@
 
 	"title": "Profectus",
 	"description": "A project made in Profectus",
-	"id": "321",
+	"id": "",
 	"author": "",
 	"discordName": "",
 	"discordLink": "",

src/features/hotkey.tsx

@@ -143,7 +143,8 @@ globalBus.on("setupVue", () =>
                     <div style="column-count: 2">
                         {keys.map(hotkey => (
                             <div>
-                                <Hotkey hotkey={hotkey as GenericHotkey} /> {unref(}
+                                <Hotkey hotkey={hotkey as GenericHotkey} />{" "}
+                                {unref(hotkey?.description)}
                             </div>
                         ))}
                     </div>