Updated parseConditional in parser.js