fix parser
merge