@@ -59,8 +59,5 @@ rule 1
<http://git.thestrengthfoundry.com>
<https://www.markdownguide.org>
<fake@example.com>
-<<<<<<< HEAD
-=======
my markdown is better than Wesleys -Emma
->>>>>>> improved the quality of markdown
jb6113