diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 21dadcafa..2684ccc3e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,24 +1,3 @@
-
-<<<<<<< HEAD
-=======
-
-
-
-!! Version 2.X is not supported anymore. Pleas don't open a issue for the 2.x version.
-See https://github.com/tidusjar/Ombi/issues/1455 for more information.
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> origin/master
 <!--- 
 
 !! Please use the Support / bug report template, otherwise we will close the Github issue !!