diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d7de324..27fa94d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,43 +3,25 @@ name: Bug report
 about: swhkd bugs
 title: ''
 labels: bug
-assignees: UnsignedArduino, angelofallars, Shinyzenith
+assignees: UnsignedArduino, angelofallars, Shinyzenith, EdenQwQ
 
 ---
 
-<<<<<<< HEAD
-**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.
-
 **Version Information:**
  - Distribution Information ( run `uname -a` )
  - swhkd version ( `swhkd -V` )
 
-**Additional information:**
-Anything else you'd like us to know ?
-=======
-**Describe the bug**
+**Describe the bug:**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
-
-**Expected behavior**
+**Expected behavior:**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Actual behavior:**
+A clear and concise description of the behavior.
 
-**Desktop (please complete the following information):**
- - Distribution Information ( run `uname -a` )
- - swhkd version ( `swhkd -v` ) 
+**To Reproduce:**
+Steps to reproduce the behavior.
 
-**Additional information**
-Anything else you'd like us to know.
->>>>>>> main
+**Additional information:**
+Anything else you'd like us to know ?