add new parser columns
fix the conflict