Merge with new-parser