played with parser
fixed merge conflicts