Update parser.y

Conflicts removed