Commit match_template.java