Merge "Fix mismatched-tags error"