fix conflict. silly…

readme.md

@@ -4,11 +4,7 @@ Headsmart is a jQuery plugin which applies header hierarchy dynamically based on
 
 When building templates, you can't put faith in the user that they'll add header tags in the hierarchy you prefer. While we'd love to assume that they'd know to start with an `<h3>`, more likely they'll start with an `<h1>`. This is where Headsmart comes in.
 
-<<<<<<< HEAD
 Headsmart looks at the element you supply it, and assigns header classes levels 1 – 6 to the header tags that are actually present. That means that the largest header will still look like your level 1 header whether it's a `<h1>` or `<h3>`.
-=======
-Headsmart looks at the element you supply it, and assigns header classes levels 1 – 6 to the headers that are actually present. That means that the largest header will still look like your level 1 header whether it's a `<h1>` or `<h3>`.
->>>>>>> origin/master
 
 ## Usage