Resolve merge conflict

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,14 +8,6 @@ assignees: ''
 ### User Story
 *As a ...insert type of user... I'd like to ...insert desired feature or behavior...*
 
-<<<<<<< Updated upstream
-- [ ] Requirement sufficiently defined  
-- [ ] Approach determined  
-- [ ] User story satisfied
-- [ ] Doc strings
-- [ ] General documentation
-- [ ] Tests
-=======
 Progress:
 
 - [ ] Sufficiently defined
@@ -24,7 +16,6 @@ Progress:
 - [ ] User story satisfied
 - [ ] Doc strings
 - [ ] General documentation
->>>>>>> Stashed changes
 - [ ] Passing tests
 
 ### Priority 
@@ -44,11 +35,8 @@ Reviewers:
 <!--Will this potentially break anything?-->
 
 #### Tests
-<<<<<<< Updated upstream
-*What are relevant tests or what tests need to be created in order to determine that this issue is complete?*
+<!--What are relevant tests or what tests need to be created in order to determine that this issue is complete?-->
 
 - [ ] Test for...
 
-=======
-<!--What are relevant tests or what tests need to be created in order to determine that this issue is complete?-->
->>>>>>> Stashed changes
+