fixing bad merge (#42)

source/content/intro/limitations/consistency.md

@@ -6,11 +6,8 @@ Git tracks only the content of files, not the functionality of the code within t
 
 There is **no** guarantee that:
 
-<<<<<<< HEAD
 - Git will identify breaking changes as a conflict;{% if page %}[^sn3]{% endif %}
 - Two functioning versions combined will not result in a dysfunctional version.
-=======
->>>>>>> main
 
 {% if page %}
 [^sn3]: This is rather obvious, if you think about it. But it is something that might not be thought about if <i class="fab fa-git"></i> is not reporting any conflicts when merging changes from different sources.