Fix merge problem, and rebuild parser.js