master branch contains git conflict markers.

[sbc100]

https://github.com/microsoft/mimalloc/compare/v2.2.2..e1123000

 git diff v2.2.2..origin/master
diff --git a/SECURITY.md b/SECURITY.md
index b3c89efc..0ad51aa0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -28,7 +28,11 @@ Please include the requested information listed below (as much as you can provid
 
 This information will help us triage your report more quickly.
 
+<<<<<<< HEAD
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+=======
 If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+>>>>>>> dev-slice
 
 ## Preferred Languages

[daanx]

Ah strange -- I guess it is because it had been updated by a bot; I'll fix it for the next release (coming this week)

[daanx]

Fixed. Thanks!