diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 6d36f734..a38e5f84 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,11 +46,8 @@ body:
         - 0.25.0
         - 0.24.0
         - 0.23.0
-<<<<<<< Updated upstream
-=======
         - 0.22.0
         - 0.21.0
->>>>>>> Stashed changes
         - older
     validations:
       required: true