cleaned up regex_html_match
Fixed merge conflict