merge parse changes