merge
fix doublematch bug, add reestr