Update README

Author: NullVoxPopuli

README.md

@@ -278,13 +278,8 @@ rules in templates can be disabled with eslint directives with mustache or html
 | [no-string-prototype-extensions](docs/rules/no-string-prototype-extensions.md)                   | disallow usage of `String` prototype extensions           | ✅  |    |    |
 | [template-no-action](docs/rules/template-no-action.md)                                           | disallow {{action}} helper                                |    |    |    |
 | [template-no-attrs-in-components](docs/rules/template-no-attrs-in-components.md)                 | disallow attrs in component templates                     |    |    |    |
-<<<<<<< HEAD
-| [template-no-link-to-tagname](docs/rules/template-no-link-to-tagname.md)                         | disallow tagName attribute on LinkTo component            |    |    |    |
-||||||| parent of ca1530ad (Extract rule: template-no-link-to-positional-params)
-=======
 | [template-no-link-to-positional-params](docs/rules/template-no-link-to-positional-params.md)     | disallow positional params in LinkTo component            |    |    |    |
-
->>>>>>> ca1530ad (Extract rule: template-no-link-to-positional-params)
+| [template-no-link-to-tagname](docs/rules/template-no-link-to-tagname.md)                         | disallow tagName attribute on LinkTo component            |    |    |    |
 
 ### Ember Data