merge parse.y