diff --git a/README.md b/README.md
index ff56cbd..9835e3e 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,15 @@
 ---
 
 This playable post is [public domain (CC0)](http://creativecommons.org/publicdomain/zero/1.0).
-			
+
+This repository also has some baked in merge conflicts for practice. 
+
 Please feel free to use this in your classrooms,
 make video/picture/text adaptations,
 or modify the source code!
 Attribution is not mandatory, but super appreciated.
-We are [Vi Hart](http://vihart.com/) and [Nicky Case](http://ncase.me/). 
-		
+We are [Vi Hart](http://vihart.com/) and [Nicky Case](http://ncase.me/).
+
 Show us how you're using and remixing Parable of the Polygons!    
 Tweet us at
 [@vihartvihart](https://twitter.com/vihartvihart) and