[merge] Merge rust-rewrite branch to main

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,7 @@ assignees: UnsignedArduino, angelofallars, Shinyzenith
 
 ---
 
+<<<<<<< HEAD
 **Describe the bug:**
 A clear and concise description of what the bug is.
 
@@ -22,3 +23,23 @@ A clear and concise description of what you expected to happen.
 
 **Additional information:**
 Anything else you'd like us to know ?
+=======
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Distribution Information ( run `uname -a` )
+ - swhkd version ( `swhkd -v` ) 
+
+**Additional information**
+Anything else you'd like us to know.
+>>>>>>> main