diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 8e5577e..a5d6ffa 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 blank_issues_enabled: false
 contact_links:
   - name: 🗨 Discussions
     url: https://discord.gg/ddcQf3s2Uq
     about: Have something unspecific to Revenge in mind? Join us on Discord!
-=======
-blank_issues_enabled: false
->>>>>>> upstream/main