Fix erroneous merge conflict resolve - parse_htaccess is back in template