fixed post run parse
fixed merge conflict