parser
fixed merge