Resolved merge conflict

Resolves merge conflict in `ext_emconf.php` (mentioned in issue https://github.com/b13/t3ext-seo_basics/issues/1).