Fix GitHub templates

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -14,11 +14,7 @@ body:
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-<<<<<<< HEAD
-      placeholder: v3.1.6
-=======
       placeholder: v3.1.7
->>>>>>> develop
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -14,11 +14,7 @@ body:
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-<<<<<<< HEAD
-      placeholder: v3.1.6
-=======
       placeholder: v3.1.7
->>>>>>> develop
     validations:
       required: true
   - type: dropdown