diff --git a/SECURITY.md b/SECURITY.md
index 44af883..68528b5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -8,6 +8,7 @@ If you’ve found a vulnerability, [submit it here](https://hackerone.com/github
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 Even though [open source repositories are outside of the scope of our bug bounty program](https://bounty.github.com/index.html#scope) and therefore not eligible for bounty rewards, we will ensure that your finding gets passed along to the appropriate maintainers for remediation. 
 
 ## Reporting Security Issues
@@ -45,3 +46,6 @@ You can find useful information in our [rules](https://bounty.github.com/#rules)
 =======
 You can find useful information in our [rules](https://bounty.github.com/#rules), [scope](https://bounty.github.com/#scope), [targets](https://bounty.github.com/#scope) and [FAQ](https://bounty.github.com/#faqs).
 >>>>>>> parent of d92faa6 (Merge pull request #45 from github/update-security-policy)
+=======
+You can find useful information in our [rules](https://bounty.github.com/#rules), [scope](https://bounty.github.com/#scope), [targets](https://bounty.github.com/#scope) and [FAQ](https://bounty.github.com/#faqs).
+>>>>>>> parent of d92faa6 (Merge pull request #45 from github/update-security-policy)